修复文件校验

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

.github/workflows/build_docker_image.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - "master"
       - "develop"
+      - "test-cli"
     tags:
       - "v*"
   schedule:

README-en.md

@@ -48,12 +48,83 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
+The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` to be installed.
 
 ```bash
 npm i @whyour/qinglong
 ```
 
+## Deployment
+
+### Docker (Recommended)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### Docker-compose (Recommended)
+
+```bash
+# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# start
+docker-compose up -d
+# stop
+docker-compose down
+```
+
+### Podman (Recommended)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### Npm
+
+It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3/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
+export QL_DIR=""
+export QL_DATA_DIR=""
+# Run again
+qinglong
+```
+
 ## Built-in commands
 
 - task
@@ -110,89 +181,16 @@ ql resettfa
 | days | File path for task execution |
 | file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |
 
-## Deployment
-
-### Docker (Recommended)
-
-```bash
-# curl -sSL get.docker.com | sh
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
-  -p 5700:5700 \
-  # Deployment paths are not required, e.g. /test.
-  -e QlBaseUrl="/" \
-  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### Docker-compose (Recommended)
-
-```bash
-# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# start
-docker-compose up -d
-# stop
-docker-compose down
-```
-
-### Podman (Recommended)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
-  -p 5700:5700 \
-  # Deployment paths are not required, e.g. /test.
-  -e QlBaseUrl="/" \
-  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### Local
-
-It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3 yourself
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-# Centos
-curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
-export QL_DIR=""
-export QL_DATA_DIR=""
-# Run again
-qinglong
-```
-
 ## Development
 
 ```bash
-$ git clone https://github.com/whyour/qinglong.git
+git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
+cd qinglong
-$ cp .env.example .env
+cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
+npm install -g pnpm@8.3.1
-$ pnpm install
+pnpm install
-$ pnpm start
+pnpm start
 ```
 
 Open your browser and visit <http://127.0.0.1:5700>

README.md

@@ -50,12 +50,83 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
+npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm`
 
 ```bash
 npm i @whyour/qinglong
 ```
 
+## 部署
+
+### docker (推荐)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### docker-compose (推荐)
+
+```bash
+#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# 启动
+docker-compose up -d
+# 停止
+docker-compose down
+```
+
+### podman (推荐)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### 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
+export QL_DIR=""
+export QL_DATA_DIR=""
+# 再次执行
+qinglong
+```
+
 ## 内置命令
 
 - task
@@ -110,89 +181,16 @@ ql resettfa
 | days       | 需要保留的日志的天数                                                                        |
 | file_path  | 任务执行时的文件路径                                                                        |
 
-## 部署
-
-### docker (推荐)
-
-```bash
-# curl -sSL get.docker.com | sh
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
-  -p 5700:5700 \
-  # 部署路径非必须，比如 /test
-  -e QlBaseUrl="/" \
-  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### docker-compose (推荐)
-
-```bash
-#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# 启动
-docker-compose up -d
-# 停止
-docker-compose down
-```
-
-### podman (推荐)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
-  -p 5700:5700 \
-  # 部署路径非必须，比如 /test
-  -e QlBaseUrl="/" \
-  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### 本机
-
-建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-# Centos
-curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
-export QL_DIR=""
-export QL_DATA_DIR=""
-# 再次执行
-qinglong
-```
-
 ## 开发
 
 ```bash
-$ git clone https://github.com/whyour/qinglong.git
+git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
+cd qinglong
-$ cp .env.example .env
+cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
+npm install -g pnpm@8.3.1
-$ pnpm install
+pnpm install
-$ pnpm start
+pnpm start
 ```
 
 打开你的浏览器，访问 <http://127.0.0.1:5700>

back/api/env.ts

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

back/api/script.ts

@@ -136,7 +136,7 @@ export default (app: Router) => {
         }
 
         if (req.file) {
-          await fs.rename(req.file.path, join(path, req.file.filename));
+          await fs.rename(req.file.path, join(path, filename));
           return res.send({ code: 200 });
         }
 

back/app.ts

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

back/config/index.ts

@@ -19,7 +19,12 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
-const dataPath = path.join(rootPath, 'data/');
+let dataPath = path.join(rootPath, 'data/');
+
+if (process.env.QL_DATA_DIR) {
+  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
+}
+
 const shellPath = path.join(rootPath, 'shell/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
@@ -33,6 +38,8 @@ const sshdPath = path.join(dataPath, 'ssh.d/');
 const systemLogPath = path.join(dataPath, 'syslog/');
 
 const envFile = path.join(configPath, 'env.sh');
+const jsEnvFile = path.join(configPath, 'env.js');
+const pyEnvFile = path.join(configPath, 'env.py');
 const confFile = path.join(configPath, 'config.sh');
 const crontabFile = path.join(configPath, 'crontab.list');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -82,6 +89,8 @@ export default {
   sampleFile,
   confFile,
   envFile,
+  jsEnvFile,
+  pyEnvFile,
   dbPath,
   uploadPath,
   configPath,
@@ -94,6 +103,8 @@ export default {
     'crontab.list',
     'dependence-proxy.sh',
     'env.sh',
+    'env.js',
+    'env.py',
     'token.json',
   ],
   writePathList: [configPath, scriptPath],

back/config/subscription.ts

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

back/config/util.ts

@@ -30,7 +30,7 @@ export async function getLastModifyFilePath(dir: string) {
 
     arr.forEach(async (item) => {
       const fullpath = path.join(dir, item);
-      const stats = await fs.stat(fullpath);
+      const stats = await fs.lstat(fullpath);
       if (stats.isFile()) {
         if (stats.mtimeMs >= 0) {
           filePath = fullpath;
@@ -257,7 +257,7 @@ export async function readDirs(
 
   for (const file of files) {
     const subPath = path.join(dir, file);
-    const stats = await fs.stat(subPath);
+    const stats = await fs.lstat(subPath);
     const key = path.join(relativePath, file);
 
     if (blacklist.includes(file) || stats.isSymbolicLink()) {
@@ -300,7 +300,7 @@ export async function readDir(
     .filter((x) => !blacklist.includes(x))
     .map(async (file: string) => {
       const subPath = path.join(dir, file);
-      const stats = await fs.stat(subPath);
+      const stats = await fs.lstat(subPath);
       const key = path.join(relativePath, file);
       return {
         title: file,
@@ -399,7 +399,7 @@ export function parseBody(
   valueFormatFn?: (v: string) => string,
 ) {
   if (contentType === 'text/plain' || !body) {
-    return body;
+    return valueFormatFn && body ? valueFormatFn(body) : body;
   }
 
   const parsed = parseString(body, valueFormatFn);

back/data/notify.ts

@@ -14,6 +14,7 @@ export enum NotificationMode {
   'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
+  'wePlusBot' = 'wePlusBot',
   'email' = 'email',
   'pushMe' = 'pushMe',
   'feishu' = 'feishu',
@@ -58,6 +59,7 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkGroup = 'qinglong';
   public barkLevel = 'active';
   public barkUrl = '';
+  public barkArchive=""
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -99,6 +101,12 @@ export class PushPlusNotification extends NotificationBaseInfo {
   public pushPlusUser = '';
 }
 
+export class WePlusBotNotification extends NotificationBaseInfo {
+  public wePlusBotToken = '';
+  public wePlusBotReceiver = '';
+  public wePlusBotVersion = '';
+}
+
 export class EmailNotification extends NotificationBaseInfo {
   public emailService: string = '';
   public emailUser: string = '';
@@ -107,6 +115,7 @@ export class EmailNotification extends NotificationBaseInfo {
 
 export class PushMeNotification extends NotificationBaseInfo {
   public pushMeKey: string = '';
+  public pushMeUrl: string = '';
 }
 
 export class ChronocatNotification extends NotificationBaseInfo {
@@ -144,6 +153,7 @@ export interface NotificationInfo
     AibotkNotification,
     IGotNotification,
     PushPlusNotification,
+    WePlusBotNotification,
     EmailNotification,
     PushMeNotification,
     WebhookNotification,

back/data/system.ts

@@ -2,13 +2,13 @@ import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
 import { NotificationInfo } from './notify';
 
-export class AuthInfo {
+export class SystemInfo {
   ip?: string;
   type: AuthDataType;
   info?: SystemModelInfo;
   id?: number;
 
-  constructor(options: AuthInfo) {
+  constructor(options: SystemInfo) {
     this.ip = options.ip;
     this.info = options.info;
     this.type = options.type;
@@ -50,7 +50,7 @@ export type SystemModelInfo = SystemConfigInfo &
   Partial<NotificationInfo> &
   LoginLogInfo;
 
-export interface SystemInstance extends Model<AuthInfo, AuthInfo>, AuthInfo { }
+export interface SystemInstance extends Model<SystemInfo, SystemInfo>, SystemInfo { }
 export const SystemModel = sequelize.define<SystemInstance>('Auth', {
   ip: DataTypes.STRING,
   type: DataTypes.STRING,

back/loaders/app.ts

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

back/loaders/deps.ts

@@ -19,23 +19,35 @@ async function linkToNodeModule(src: string, dst?: string) {
 async function linkCommand() {
   const commandPath = await promiseExec('which node');
   const commandDir = path.dirname(commandPath);
-  const linkShell = [
+  const oldLinkShell = [
     {
       src: 'update.sh',
       dest: 'ql',
-    },
+      tmp: 'ql_tmp',
-    {
-      src: 'task.sh',
-      dest: 'task',
     },
   ];
+  // const newLinkShell = [
+  //   {
+  //     src: 'task.mjs',
+  //     dest: 'task',
+  //     tmp: 'task_tmp',
+  //   },
+  // ];
 
-  for (const link of linkShell) {
+  for (const link of oldLinkShell) {
     const source = path.join(config.rootPath, 'shell', link.src);
     const target = path.join(commandDir, link.dest);
-    await rmPath(target);
+    const tmpTarget = path.join(commandDir, link.tmp);
-    await fs.symlink(source, target);
+    await fs.symlink(source, tmpTarget);
+    await fs.rename(tmpTarget, target);
   }
+  // for (const link of newLinkShell) {
+  //   const source = path.join(config.rootPath, 'cli', link.src);
+  //   const target = path.join(commandDir, link.dest);
+  //   const tmpTarget = path.join(commandDir, link.tmp);
+  //   await fs.symlink(source, tmpTarget);
+  //   await fs.rename(tmpTarget, target);
+  // }
 }
 
 export default async (src: string = 'deps') => {

back/loaders/initData.ts

@@ -18,6 +18,10 @@ export default async () => {
   const dependenceService = Container.get(DependenceService);
   const systemService = Container.get(SystemService);
 
+  // 初始化增加系统配置
+  await SystemModel.upsert({ type: AuthDataType.systemConfig });
+  await SystemModel.upsert({ type: AuthDataType.notification });
+
   const installDependencies = () => {
     // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
     DependenceModel.findAll({
@@ -121,7 +125,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/log/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/log/${doc.command.replace(
+              command: `${config.dataPath}/log/${doc.command.replace(
                 `${config.rootPath}/log/`,
                 '',
               )}`,
@@ -132,7 +136,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/config/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/config/${doc.command.replace(
+              command: `${config.dataPath}/config/${doc.command.replace(
                 `${config.rootPath}/config/`,
                 '',
               )}`,
@@ -143,7 +147,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/db/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/db/${doc.command.replace(
+              command: `${config.dataPath}/db/${doc.command.replace(
                 `${config.rootPath}/db/`,
                 '',
               )}`,
@@ -158,7 +162,4 @@ export default async () => {
   // 初始化保存一次ck和定时任务数据
   await cronService.autosave_crontab();
   await envService.set_envs();
-
-  // 初始化增加系统配置
-  await SystemModel.upsert({ type: AuthDataType.systemConfig });
 };

back/loaders/initFile.ts

@@ -5,7 +5,12 @@ import Logger from './logger';
 import { fileExist } from '../config/util';
 
 const rootPath = process.env.QL_DIR as string;
-const dataPath = path.join(rootPath, 'data/');
+let dataPath = path.join(rootPath, 'data/');
+
+if (process.env.QL_DATA_DIR) {
+  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
+}
+
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');

back/public.ts

@@ -21,7 +21,7 @@ app.get('/api/health', (req, res) => {
 });
 
 app
-  .listen(config.publicPort, async () => {
+  .listen(config.publicPort, '0.0.0.0', async () => {
     await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
 

back/services/cron.ts

@@ -114,7 +114,13 @@ export default class CronService {
     }
 
     for (const id of ids) {
-      const cron = await this.getDb({ id });
+      let cron;
+      try {
+        cron = await this.getDb({ id });
+      } catch (err) {}
+      if (!cron) {
+        continue;
+      }
       if (status === CrontabStatus.idle && log_path !== cron.log_path) {
         options = omit(options, ['status', 'log_path', 'pid']);
       }
@@ -375,7 +381,10 @@ export default class CronService {
 
   public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Crontab);
+    if (!doc) {
+      throw new Error(`Cron ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -407,7 +416,7 @@ export default class CronService {
   }
 
   private async runSingle(cronId: number): Promise<number | void> {
-    return taskLimit.runWithCronLimit(() => {
+    return taskLimit.manualRunWithCronLimit(() => {
       return new Promise(async (resolve: any) => {
         const cron = await this.getDb({ id: cronId });
         const params = {
@@ -434,9 +443,11 @@ export default class CronService {
         }
         const logPath = `${uniqPath}/${logTime}.log`;
         const absolutePath = path.resolve(config.logPath, `${logPath}`);
-
         const cp = spawn(
-          `real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`,
+          `real_log_path=${logPath} no_delay=true ${this.makeCommand(
+            cron,
+            true,
+          )}`,
           { shell: '/bin/bash' },
         );
 
@@ -444,11 +455,14 @@ export default class CronService {
           { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
           { where: { id } },
         );
+        cp.stdout.on('data', async (data) => {
+          await fs.appendFile(absolutePath, data.toString());
+        });
         cp.stderr.on('data', async (data) => {
-          await fs.appendFile(`${absolutePath}`, `${data.toString()}`);
+          await fs.appendFile(absolutePath, data.toString());
         });
         cp.on('error', async (err) => {
-          await fs.appendFile(`${absolutePath}`, `${JSON.stringify(err)}`);
+          await fs.appendFile(absolutePath, JSON.stringify(err));
         });
 
         cp.on('exit', async (code) => {
@@ -515,7 +529,7 @@ export default class CronService {
           files.map(async (x) => ({
             filename: x,
             directory: relativeDir.replace(config.logPath, ''),
-            time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
+            time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
           })),
         )
       ).sort((a, b) => b.time - a.time);
@@ -524,12 +538,14 @@ export default class CronService {
     }
   }
 
-  private makeCommand(tab: Crontab) {
+  private makeCommand(tab: Crontab, realTime?: boolean) {
     let command = tab.command.trim();
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    let commandVariable = `no_tee=true ID=${tab.id} `;
+    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${
+      tab.id
+    } `;
     if (tab.task_before) {
       commandVariable += `task_before='${tab.task_before
         .replace(/'/g, "'\\''")

back/services/cronView.ts

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

back/services/dependence.ts

@@ -183,7 +183,10 @@ export default class DependenceService {
     query: FindOptions<Dependence>['where'],
   ): Promise<Dependence> {
     const doc: any = await DependenceModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Dependence);
+    if (!doc) {
+      throw new Error(`Dependency ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   private async updateLog(ids: number[], log: string): Promise<void> {

back/services/env.ts

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

back/services/notify.ts

@@ -27,6 +27,7 @@ export default class NotificationService {
     ['aibotk', this.aibotk],
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
+    ['wePlusBot', this.wePlusBot],
     ['email', this.email],
     ['pushMe', this.pushMe],
     ['webhook', this.webhook],
@@ -196,22 +197,35 @@ export default class NotificationService {
   }
 
   private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
+    let {
-      this.params;
+      barkPush,
+      barkIcon = '',
+      barkSound = '',
+      barkGroup = '',
+      barkLevel = '',
+      barkUrl = '',
+      barkArchive = '',
+    } = this.params;
     if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
-    const url = `${barkPush}/${encodeURIComponent(
+    const url = `${barkPush}`;
-      this.title,
+    const body = {
-    )}/${encodeURIComponent(
+      title: this.title,
-      this.content,
+      body: this.content,
-    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
+      icon: barkIcon,
-
+      sound: barkSound,
+      group: barkGroup,
+      isArchive: barkArchive,
+      level: barkLevel,
+      url: barkUrl,
+    };
     try {
       const res: any = await got
-        .get(url, {
+        .post(url, {
           ...this.gotOption,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          json: body,
+          headers: { 'Content-Type': 'application/json' },
         })
         .json();
       if (res.code === 200) {
@@ -507,6 +521,42 @@ export default class NotificationService {
     }
   }
 
+  private async wePlusBot() {
+    const { wePlusBotToken, wePlusBotReceiver, wePlusBotVersion } = this.params;
+
+    let content = this.content;
+    let template = 'txt';
+    if (this.content.length > 800) {
+      template = 'html';
+      content = content.replace(/[\n\r]/g, '<br>');
+    }
+
+    const url = `https://www.weplusbot.com/send`;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            token: `${wePlusBotToken}`,
+            title: `${this.title}`,
+            template: `${template}`,
+            content: `${content}`,
+            receiver: `${wePlusBotReceiver || ''}`,
+            version: `${wePlusBotVersion || 'pro'}`,
+          },
+        })
+        .json();
+
+      if (res.code === 200) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
   private async lark() {
     let { larkKey } = this.params;
 
@@ -525,7 +575,7 @@ export default class NotificationService {
           headers: { 'Content-Type': 'application/json' },
         })
         .json();
-      if (res.StatusCode === 0) {
+      if (res.StatusCode === 0 || res.code === 0) {
         return true;
       } else {
         throw new Error(JSON.stringify(res));
@@ -567,19 +617,17 @@ export default class NotificationService {
   }
 
   private async pushMe() {
-    const { pushMeKey } = this.params;
+    const { pushMeKey, pushMeUrl } = this.params;
     try {
-      const res: any = await got.post(
+      const res: any = await got.post(pushMeUrl || 'https://push.i-i.me/', {
-        `https://push.i-i.me/?push_key=${pushMeKey}`,
-        {
         ...this.gotOption,
         json: {
+          push_key: pushMeKey,
           title: this.title,
           content: this.content,
         },
         headers: { 'Content-Type': 'application/json' },
-        },
+      });
-      );
       if (res.body === 'success') {
         return true;
       } else {

back/services/open.ts

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

back/services/schedule.ts

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

back/services/script.ts

@@ -41,7 +41,7 @@ export default class ScriptService {
     const relativePath = path.relative(config.scriptPath, filePath);
     const command = `${TASK_COMMAND} ${relativePath} now`;
     const pid = await this.scheduleService.runTask(
-      command,
+      `real_time=true ${command}`,
       this.taskCallbacks(filePath),
       { command },
       'start',
@@ -63,7 +63,10 @@ export default class ScriptService {
   }
 
   public async getFile(filePath: string, fileName: string) {
-    const _filePath = join(config.scriptPath, filePath, fileName);
+    let _filePath = join(config.scriptPath, filePath, fileName);
+    if (filePath.startsWith(config.dataPath)) {
+      _filePath = join(filePath, fileName);
+    }
     const content = await getFileContentByName(_filePath);
     return content;
   }

back/services/subscription.ts

@@ -91,9 +91,9 @@ export default class SubscriptionService {
           this.taskCallbacks(doc),
           runImmediately,
         ));
-    } else {
+    } else if (doc.interval_schedule) {
       this.scheduleService.cancelIntervalTask(doc as any);
-      const { type, value } = doc.interval_schedule as any;
+      const { type, value } = doc.interval_schedule;
       needCreate &&
         (await this.scheduleService.createIntervalTask(
           doc as any,
@@ -256,7 +256,7 @@ export default class SubscriptionService {
     );
   }
 
-  public async remove(ids: number[], query: any) {
+  public async remove(ids: number[], query: { force?: boolean }) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       await this.handleTask(doc, false);
@@ -279,8 +279,11 @@ export default class SubscriptionService {
   public async getDb(
     query: FindOptions<Subscription>['where'],
   ): Promise<Subscription> {
-    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
+    const doc = await SubscriptionModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Subscription);
+    if (!doc) {
+      throw new Error(`Subscription ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -371,7 +374,7 @@ export default class SubscriptionService {
             files.map(async (x) => ({
               filename: x,
               directory: relativeDir.replace(config.logPath, ''),
-              time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
+              time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
             })),
           )
         ).sort((a, b) => b.time - a.time);

back/services/system.ts

@@ -24,7 +24,7 @@ import {
 import { NotificationInfo } from '../data/notify';
 import {
   AuthDataType,
-  AuthInfo,
+  SystemInfo,
   SystemInstance,
   SystemModel,
   SystemModelInfo,
@@ -47,18 +47,21 @@ export default class SystemService {
 
   public async getSystemConfig() {
     const doc = await this.getDb({ type: AuthDataType.systemConfig });
-    return doc || ({} as SystemInstance);
+    return doc;
   }
 
-  private async updateAuthDb(payload: AuthInfo): Promise<SystemInstance> {
+  private async updateAuthDb(payload: SystemInfo): Promise<SystemInfo> {
     await SystemModel.upsert({ ...payload });
     const doc = await this.getDb({ type: payload.type });
     return doc;
   }
 
-  public async getDb(query: any): Promise<SystemInstance> {
+  public async getDb(query: any): Promise<SystemInfo> {
-    const doc: any = await SystemModel.findOne({ where: { ...query } });
+    const doc = await SystemModel.findOne({ where: { ...query } });
-    return doc && doc.get({ plain: true });
+    if (!doc) {
+      throw new Error(`System ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -348,20 +351,13 @@ export default class SystemService {
     }
   }
 
-  public async run(
+  public async run({ command }: { command: string }, callback: TaskCallbacks) {
-    { command, logPath }: { command: string; logPath: string },
-    callback: TaskCallbacks,
-  ) {
     if (!command.startsWith(TASK_COMMAND)) {
       command = `${TASK_COMMAND} ${command}`;
     }
-    this.scheduleService.runTask(
+    this.scheduleService.runTask(`real_time=true ${command}`, callback, {
-      `real_log_path=${logPath} real_time=true ${command}`,
-      callback,
-      {
       command,
-      },
+    });
-    );
   }
 
   public async stop({ command, pid }: { command: string; pid: number }) {
@@ -388,7 +384,9 @@ export default class SystemService {
 
   public async exportData(res: Response) {
     try {
-      await promiseExec(`cd ${config.rootPath} && tar -zcvf ${config.dataTgzFile} data/`);
+      await promiseExec(
+        `cd ${config.rootPath} && tar -zcvf ${config.dataTgzFile} data/`,
+      );
       res.download(config.dataTgzFile);
     } catch (error: any) {
       return res.send({ code: 400, message: error.message });

back/services/user.ts

@@ -1,6 +1,7 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import {
+  createFile,
   createRandomString,
   fileExist,
   getNetIp,
@@ -13,7 +14,7 @@ import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import {
   AuthDataType,
-  AuthInfo,
+  SystemInfo,
   SystemModel,
   SystemModelInfo,
   LoginStatus,
@@ -223,7 +224,7 @@ export default class UserService {
     return [];
   }
 
-  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
+  private async insertDb(payload: SystemInfo): Promise<SystemInfo> {
     const doc = await SystemModel.create({ ...payload }, { returning: true });
     return doc;
   }
@@ -266,7 +267,7 @@ export default class UserService {
   public async getUserInfo(): Promise<any> {
     const authFileExist = await fileExist(config.authConfigFile);
     if (!authFileExist) {
-      await fs.writeFile(
+      await createFile(
         config.authConfigFile,
         JSON.stringify({
           username: 'admin',
@@ -351,10 +352,10 @@ export default class UserService {
 
   public async getNotificationMode(): Promise<NotificationInfo> {
     const doc = await this.getDb({ type: AuthDataType.notification });
-    return (doc && doc.info) || {};
+    return (doc.info || {}) as NotificationInfo;
   }
 
-  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+  private async updateAuthDb(payload: SystemInfo): Promise<any> {
     let doc = await SystemModel.findOne({ type: payload.type });
     if (doc) {
       const updateResult = await SystemModel.update(payload, {
@@ -368,9 +369,12 @@ export default class UserService {
     return doc;
   }
 
-  public async getDb(query: any): Promise<any> {
+  public async getDb(query: any): Promise<SystemInfo> {
-    const doc: any = await SystemModel.findOne({ where: { ...query } });
+    const doc = await SystemModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as any);
+    if (!doc) {
+      throw new Error(`${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {

back/shared/pLimit.ts

@@ -15,6 +15,9 @@ class TaskLimit {
   private cronLimit = new PQueue({
     concurrency: Math.max(os.cpus().length, 4),
   });
+  private manualCronoLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
 
   get cronLimitActiveCount() {
     return this.cronLimit.pending;
@@ -71,6 +74,7 @@ class TaskLimit {
   public async setCustomLimit(limit?: number) {
     if (limit) {
       this.cronLimit.concurrency = limit;
+      this.manualCronoLimit.concurrency = limit;
       return;
     }
     await SystemModel.sync();
@@ -79,6 +83,7 @@ class TaskLimit {
     });
     if (doc?.info?.cronConcurrency) {
       this.cronLimit.concurrency = doc.info.cronConcurrency;
+      this.manualCronoLimit.concurrency = doc.info.cronConcurrency;
     }
   }
 
@@ -89,6 +94,13 @@ class TaskLimit {
     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 runDependeny<T>(
     dependency: Dependence,
     fn: IDependencyFn<T>,

back/update.ts

@@ -12,7 +12,7 @@ async function startServer() {
   await require('./loaders/update').default({ app });
 
   app
-    .listen(config.updatePort, () => {
+    .listen(config.updatePort, '0.0.0.0', () => {
       Logger.debug(`✌️ 更新服务启动成功！`);
       console.debug(`✌️ 更新服务启动成功！`);
       process.send?.('ready');

cli/api.mjs

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

cli/commands/update.ts

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

cli/env.mjs

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

cli/index.ts

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

cli/otask.mjs

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

cli/share.mjs

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

cli/task.mjs

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

docker/docker-entrypoint.sh

@@ -3,7 +3,6 @@
 dir_shell=/ql/shell
 . $dir_shell/env.sh
 . $dir_shell/share.sh
-link_shell
 
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d

package.json

@@ -19,6 +19,9 @@
     "test": "umi-test",
     "test:coverage": "umi-test --coverage"
   },
+  "bin": {
+    "task": "./cli/task.mjs"
+  },
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
@@ -85,7 +88,7 @@
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
     "p-queue-cjs": "7.3.4",
-    "protobufjs": "^7.2.3",
+    "protobufjs": "^7.3.0",
     "pstree.remy": "^1.1.8",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.25.5",
@@ -97,7 +100,7 @@
     "uuid": "^8.3.2",
     "winston": "^3.6.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "yargs": "^17.3.1",
+    "zx": "^8.1.4",
     "tough-cookie": "^4.0.0",
     "request-ip": "3.3.0",
     "ip2region": "2.3.0"
@@ -166,7 +169,7 @@
     "ts-node": "^10.6.0",
     "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
-    "tsx": "^3.12.3",
+    "tsx": "^4.7.3",
     "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",

pnpm-lock.yaml

@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 dependencies:
   '@grpc/grpc-js':
     specifier: ^1.8.13
@@ -89,8 +93,8 @@ dependencies:
     specifier: 7.3.4
     version: 7.3.4
   protobufjs:
-    specifier: ^7.2.3
+    specifier: ^7.3.0
-    version: 7.2.3
+    version: 7.3.0
   pstree.remy:
     specifier: ^1.1.8
     version: 1.1.8
@@ -130,9 +134,9 @@ dependencies:
   winston-daily-rotate-file:
     specifier: ^4.7.1
     version: 4.7.1(winston@3.9.0)
-  yargs:
+  zx:
-    specifier: ^17.3.1
+    specifier: ^8.1.4
-    version: 17.7.2
+    version: 8.1.4
 
 devDependencies:
   '@ant-design/icons':
@@ -325,8 +329,8 @@ devDependencies:
     specifier: ^2.4.0
     version: 2.5.3
   tsx:
-    specifier: ^3.12.3
+    specifier: ^4.7.3
-    version: 3.12.7
+    version: 4.7.3
   typescript:
     specifier: 5.2.2
     version: 5.2.2
@@ -3378,7 +3382,7 @@ packages:
     resolution: {integrity: sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==}
     dependencies:
       '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.6.0
+      get-tsconfig: 4.7.3
     dev: true
 
   /@esbuild-kit/core-utils@3.1.0:
@@ -3392,9 +3396,18 @@ packages:
     resolution: {integrity: sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==}
     dependencies:
       '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.6.0
+      get-tsconfig: 4.7.3
     dev: true
 
+  /@esbuild/aix-ppc64@0.19.12:
+    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm64@0.17.19:
     resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
     engines: {node: '>=12'}
@@ -3404,6 +3417,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-arm64@0.19.12:
+    resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm@0.17.19:
     resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
     engines: {node: '>=12'}
@@ -3413,6 +3435,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-arm@0.19.12:
+    resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-x64@0.17.19:
     resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
     engines: {node: '>=12'}
@@ -3422,6 +3453,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-x64@0.19.12:
+    resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-arm64@0.17.19:
     resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
     engines: {node: '>=12'}
@@ -3431,6 +3471,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/darwin-arm64@0.19.12:
+    resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-x64@0.17.19:
     resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
     engines: {node: '>=12'}
@@ -3440,6 +3489,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/darwin-x64@0.19.12:
+    resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-arm64@0.17.19:
     resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
     engines: {node: '>=12'}
@@ -3449,6 +3507,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/freebsd-arm64@0.19.12:
+    resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-x64@0.17.19:
     resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
     engines: {node: '>=12'}
@@ -3458,6 +3525,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/freebsd-x64@0.19.12:
+    resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm64@0.17.19:
     resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
     engines: {node: '>=12'}
@@ -3467,6 +3543,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-arm64@0.19.12:
+    resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm@0.17.19:
     resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
     engines: {node: '>=12'}
@@ -3476,6 +3561,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-arm@0.19.12:
+    resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ia32@0.17.19:
     resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
     engines: {node: '>=12'}
@@ -3485,6 +3579,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-ia32@0.19.12:
+    resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-loong64@0.17.19:
     resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
     engines: {node: '>=12'}
@@ -3494,6 +3597,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-loong64@0.19.12:
+    resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-mips64el@0.17.19:
     resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
     engines: {node: '>=12'}
@@ -3503,6 +3615,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-mips64el@0.19.12:
+    resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ppc64@0.17.19:
     resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
     engines: {node: '>=12'}
@@ -3512,6 +3633,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-ppc64@0.19.12:
+    resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-riscv64@0.17.19:
     resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
     engines: {node: '>=12'}
@@ -3521,6 +3651,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-riscv64@0.19.12:
+    resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-s390x@0.17.19:
     resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
     engines: {node: '>=12'}
@@ -3530,6 +3669,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-s390x@0.19.12:
+    resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-x64@0.17.19:
     resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
     engines: {node: '>=12'}
@@ -3539,6 +3687,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-x64@0.19.12:
+    resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/netbsd-x64@0.17.19:
     resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
     engines: {node: '>=12'}
@@ -3548,6 +3705,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/netbsd-x64@0.19.12:
+    resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/openbsd-x64@0.17.19:
     resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
     engines: {node: '>=12'}
@@ -3557,6 +3723,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/openbsd-x64@0.19.12:
+    resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/sunos-x64@0.17.19:
     resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
     engines: {node: '>=12'}
@@ -3566,6 +3741,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/sunos-x64@0.19.12:
+    resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-arm64@0.17.19:
     resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
     engines: {node: '>=12'}
@@ -3575,6 +3759,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-arm64@0.19.12:
+    resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-ia32@0.17.19:
     resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
     engines: {node: '>=12'}
@@ -3584,6 +3777,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-ia32@0.19.12:
+    resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-x64@0.17.19:
     resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
     engines: {node: '>=12'}
@@ -3593,6 +3795,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-x64@0.19.12:
+    resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@eslint-community/eslint-utils@4.4.0(eslint@8.35.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3723,7 +3934,7 @@ packages:
       '@types/long': 4.0.2
       lodash.camelcase: 4.3.0
       long: 4.0.0
-      protobufjs: 7.2.3
+      protobufjs: 7.3.0
       yargs: 17.7.2
     dev: false
 
@@ -4903,6 +5114,15 @@ packages:
     resolution: {integrity: sha512-xbqnZmGrCEqi/KUzOkeUSe77p7APvLuyellGaAoeww3CHJ1AbjQWjPSCFtKIzZn8L7LpEax4NXnC+gfa6nM7IA==}
     dev: true
 
+  /@types/fs-extra@11.0.4:
+    resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
+    requiresBuild: true
+    dependencies:
+      '@types/jsonfile': 6.1.4
+      '@types/node': 17.0.45
+    dev: false
+    optional: true
+
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
@@ -4966,6 +5186,14 @@ packages:
     resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
     dev: true
 
+  /@types/jsonfile@6.1.4:
+    resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==}
+    requiresBuild: true
+    dependencies:
+      '@types/node': 17.0.45
+    dev: false
+    optional: true
+
   /@types/jsonwebtoken@8.5.9:
     resolution: {integrity: sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==}
     dependencies:
@@ -5020,6 +5248,14 @@ packages:
   /@types/node@17.0.45:
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
+  /@types/node@20.14.9:
+    resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==}
+    requiresBuild: true
+    dependencies:
+      undici-types: 5.26.5
+    dev: false
+    optional: true
+
   /@types/nodemailer@6.4.8:
     resolution: {integrity: sha512-oVsJSCkqViCn8/pEu2hfjwVO+Gb3e+eTWjg3PcjeFKRItfKpKwHphQqbYmPQrlMk+op7pNNWPbsJIEthpFN/OQ==}
     dependencies:
@@ -7179,7 +7415,7 @@ packages:
       normalize-path: 3.0.0
       readdirp: 3.6.0
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
 
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
@@ -8439,6 +8675,37 @@ packages:
       '@esbuild/win32-x64': 0.17.19
     dev: true
 
+  /esbuild@0.19.12:
+    resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.19.12
+      '@esbuild/android-arm': 0.19.12
+      '@esbuild/android-arm64': 0.19.12
+      '@esbuild/android-x64': 0.19.12
+      '@esbuild/darwin-arm64': 0.19.12
+      '@esbuild/darwin-x64': 0.19.12
+      '@esbuild/freebsd-arm64': 0.19.12
+      '@esbuild/freebsd-x64': 0.19.12
+      '@esbuild/linux-arm': 0.19.12
+      '@esbuild/linux-arm64': 0.19.12
+      '@esbuild/linux-ia32': 0.19.12
+      '@esbuild/linux-loong64': 0.19.12
+      '@esbuild/linux-mips64el': 0.19.12
+      '@esbuild/linux-ppc64': 0.19.12
+      '@esbuild/linux-riscv64': 0.19.12
+      '@esbuild/linux-s390x': 0.19.12
+      '@esbuild/linux-x64': 0.19.12
+      '@esbuild/netbsd-x64': 0.19.12
+      '@esbuild/openbsd-x64': 0.19.12
+      '@esbuild/sunos-x64': 0.19.12
+      '@esbuild/win32-arm64': 0.19.12
+      '@esbuild/win32-ia32': 0.19.12
+      '@esbuild/win32-x64': 0.19.12
+    dev: true
+
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
@@ -9122,8 +9389,8 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     requiresBuild: true
 
-  /fsevents@2.3.2:
+  /fsevents@2.3.3:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
@@ -9237,8 +9504,8 @@ packages:
       get-intrinsic: 1.2.1
     dev: true
 
-  /get-tsconfig@4.6.0:
+  /get-tsconfig@4.7.3:
-    resolution: {integrity: sha512-lgbo68hHTQnFddybKbbs/RDRJnJT5YyGy2kQzVwbq+g67X73i+5MVTval34QxGkOe9X5Ujf1UYpCaphLyltjEg==}
+    resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==}
     dependencies:
       resolve-pkg-maps: 1.0.0
     dev: true
@@ -10222,7 +10489,7 @@ packages:
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /jest-regex-util@29.4.3:
@@ -12588,8 +12855,8 @@ packages:
       long: 4.0.0
     dev: true
 
-  /protobufjs@7.2.3:
+  /protobufjs@7.3.0:
-    resolution: {integrity: sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==}
+    resolution: {integrity: sha512-YWD03n3shzV9ImZRX3ccbjqLxj7NokGN0V/ESiBV5xWqrommYHYiihuIyavq03pWSGqlyvYUFmfoMKd+1rPA/g==}
     engines: {node: '>=12.0.0'}
     requiresBuild: true
     dependencies:
@@ -14315,7 +14582,7 @@ packages:
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /run-applescript@5.0.0:
@@ -15561,7 +15828,18 @@ packages:
       '@esbuild-kit/core-utils': 3.1.0
       '@esbuild-kit/esm-loader': 2.5.5
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
+    dev: true
+
+  /tsx@4.7.3:
+    resolution: {integrity: sha512-+fQnMqIp/jxZEXLcj6WzYy9FhcS5/Dfk8y4AtzJ6ejKcKqmfTF8Gso/jtrzDggCF2zTU20gJa6n8XqPYwDAUYQ==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+    dependencies:
+      esbuild: 0.19.12
+      get-tsconfig: 4.7.3
+    optionalDependencies:
+      fsevents: 2.3.3
     dev: true
 
   /tty-browserify@0.0.0:
@@ -15735,6 +16013,12 @@ packages:
     resolution: {integrity: sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==}
     dev: false
 
+  /undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /unescape@1.0.1:
     resolution: {integrity: sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==}
     engines: {node: '>=0.10.0'}
@@ -16041,7 +16325,7 @@ packages:
       postcss: 8.4.24
       rollup: 3.24.0
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /vm-browserify@1.1.2:
@@ -16397,6 +16681,15 @@ packages:
       strip-indent: 2.0.0
     dev: true
 
+  /zx@8.1.4:
+    resolution: {integrity: sha512-QFDYYpnzdpRiJ3dL2102Cw26FpXpWshW4QLTGxiYfIcwdAqg084jRCkK/kuP/NOSkxOjydRwNFG81qzA5r1a6w==}
+    engines: {node: '>= 12.17.0'}
+    hasBin: true
+    optionalDependencies:
+      '@types/fs-extra': 11.0.4
+      '@types/node': 20.14.9
+    dev: false
+
   github.com/whyour/node-sqlite3/3a00af0b5d7603b7f1b290032507320b18a6b741:
     resolution: {tarball: https://codeload.github.com/whyour/node-sqlite3/tar.gz/3a00af0b5d7603b7f1b290032507320b18a6b741}
     name: '@whyour/sqlite3'
@@ -16416,7 +16709,3 @@ packages:
       - encoding
       - supports-color
     dev: false
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false

sample/config.sample.sh

@@ -56,6 +56,12 @@ export BARK_ICON="https://qn.whyour.cn/logo.png"
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
 export BARK_GROUP="QingLong"
+## bark 推送时效性
+export BARK_LEVEL="active"
+## bark 推送是否存档
+export BARK_ARCHIVE=""
+## bark 推送跳转 URL
+export BARK_URL=""
 
 ## 3. Telegram
 ## 下方填写自己申请@BotFather的Token，如10xxx4:AAFcqxxxxgER5uw
@@ -112,7 +118,18 @@ export PUSH_PLUS_TOKEN=""
 ## 1. 需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送
 export PUSH_PLUS_USER=""
 
-## 9. go-cqhttp
+## 9. 微加机器人
+## 官方网站：http://www.weplusbot.com
+## 下方填写您的Token；微信扫描登录后在"我的"->"设置"->"令牌"中获取
+export WE_PLUS_BOT_TOKEN=""
+## 消息接收人；
+## 个人版填写接收消息的群编码，不填发送给自己的微信号
+## 专业版不填默认发给机器人自己，发送给好友填写wxid，发送给微信群填写群编码
+export WE_PLUS_BOT_RECEIVER=""
+## 调用版本；分为专业版和个人版，专业版填写pro，个人版填写personal
+export WE_PLUS_BOT_VERSION="pro"
+
+## 10. go-cqhttp
 ## gobot_url 推送到个人QQ: http://127.0.0.1/send_private_msg  群：http://127.0.0.1/send_group_msg
 ## gobot_token 填写在go-cqhttp文件设置的访问密钥
 ## gobot_qq 如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群
@@ -121,7 +138,7 @@ export GOBOT_URL=""
 export GOBOT_TOKEN=""
 export GOBOT_QQ=""
 
-## 10. gotify
+## 11. gotify
 ## gotify_url 填写gotify地址,如https://push.example.de:8080
 ## gotify_token 填写gotify的消息应用token
 ## gotify_priority 填写推送消息优先级,默认为0
@@ -129,17 +146,17 @@ export GOTIFY_URL=""
 export GOTIFY_TOKEN=""
 export GOTIFY_PRIORITY=0
 
-## 11. PushDeer
+## 12. PushDeer
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""
 
-## 12. Chat
+## 13. Chat
 ## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
 ## chat_token 填写后面的token
 export CHAT_URL=""
 export CHAT_TOKEN=""
 
-## 13. aibotk
+## 14. aibotk
 ## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
 ## aibotk_key (必填)填写智能微秘书个人中心的apikey
 export AIBOTK_KEY=""
@@ -148,7 +165,7 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""
 
-## 13. CHRONOCAT
+## 15. CHRONOCAT
 ## CHRONOCAT_URL 推送 http://127.0.0.1:16530
 ## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
 ## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
@@ -157,7 +174,7 @@ export CHRONOCAT_URL=""
 export CHRONOCAT_QQ=""
 export CHRONOCAT_TOKEN=""
 
-## 14. SMTP
+## 16. SMTP
 ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 export SMTP_SERVICE=""
 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
@@ -167,12 +184,26 @@ export SMTP_PASSWORD=""
 ## smtp_name 填写 SMTP 收发件人姓名，可随意填写
 export SMTP_NAME=""
 
-## 15. PushMe
+## 17. PushMe
 ## 官方说明文档：https://push.i-i.me/
 ## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
+## PUSHME_URL (选填)填写自建的PushMeServer消息服务接口地址，例如：http://127.0.0.1:3010，不填则使用官方接口服务
 export PUSHME_KEY=""
+export PUSHME_URL=""
 
-## 15. 自定义通知
+## 18. 飞书机器人
+## 官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
+## FSKEY 飞书机器人的 FSKEY
+export FSKEY=""
+
+## 19. Qmsg酱
+## 官方文档：https://qmsg.zendee.cn/docs/api/
+## qmsg 酱的 QMSG_KEY
+## qmsg 酱的 QMSG_TYPE send 为私聊，group 为群聊
+export QMSG_KEY=""
+export QMSG_TYPE=""
+
+## 20. 自定义通知
 ## 自定义通知 接收回调的URL
 export WEBHOOK_URL=""
 ## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"

sample/notify.py

@@ -33,7 +33,7 @@ def print(text, *args, **kw):
 # 通知服务
 # fmt: off
 push_config = {
-    'HITOKOTO': False,                  # 启用一言（随机句子）
+    'HITOKOTO': True,                  # 启用一言（随机句子）
 
     'BARK_PUSH': '',                    # bark IP 或设备码，例：https://api.day.app/DxHcxxxxxRxxxxxxcm/
     'BARK_ARCHIVE': '',                 # bark 推送是否存档
@@ -43,7 +43,7 @@ push_config = {
     'BARK_LEVEL': '',                   # bark 推送时效性
     'BARK_URL': '',                     # bark 推送跳转URL
 
-    'CONSOLE': True,                    # 控制台输出
+    'CONSOLE': False,                    # 控制台输出
 
     'DD_BOT_SECRET': '',                # 钉钉机器人的 DD_BOT_SECRET
     'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
@@ -75,6 +75,10 @@ push_config = {
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
 
+    'WE_PLUS_BOT_TOKEN': '',            # 微加机器人的用户令牌
+    'WE_PLUS_BOT_RECEIVER': '',         # 微加机器人的消息接收者
+    'WE_PLUS_BOT_VERSION': 'pro',          # 微加机器人的调用版本
+
     'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
     'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE
 
@@ -101,7 +105,8 @@ push_config = {
     'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
     'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
 
-    'PUSHME_KEY': '',                   # PushMe 酱的 PUSHME_KEY
+    'PUSHME_KEY': '',                   # PushMe 的 PUSHME_KEY
+    'PUSHME_URL': '',                   # PushMe 的 PUSHME_URL
 
     'CHRONOCAT_QQ': '',                 # qq号
     'CHRONOCAT_TOKEN': '',              # CHRONOCAT 的token
@@ -113,29 +118,27 @@ push_config = {
     'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
     'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
-notify_function = []
 # fmt: on
 
-# 首先读取 面板变量 或者 github action 运行变量
 for k in push_config:
     if os.getenv(k):
         v = os.getenv(k)
         push_config[k] = v
 
 
-def bark(title: str, content: str, **kwargs) -> None:
+def bark(title: str, content: str) -> None:
     """
     使用 bark 推送消息。
     """
-    if not (push_config.get("BARK_PUSH") or kwargs.get("BARK_PUSH")):
+    if not push_config.get("BARK_PUSH"):
         print("bark 服务的 BARK_PUSH 未设置!!\n取消推送")
         return
     print("bark 服务启动")
-    BARK_PUSH = kwargs.get("BARK_PUSH", push_config.get("BARK_PUSH"))
+
-    if BARK_PUSH.startswith("http"):
+    if push_config.get("BARK_PUSH").startswith("http"):
-        url = f"{BARK_PUSH}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}"
+        url = f'{push_config.get("BARK_PUSH")}'
     else:
-        url = f"https://api.day.app/{BARK_PUSH}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}"
+        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}'
 
     bark_params = {
         "BARK_ARCHIVE": "isArchive",
@@ -145,19 +148,22 @@ def bark(title: str, content: str, **kwargs) -> None:
         "BARK_LEVEL": "level",
         "BARK_URL": "url",
     }
-    params = ""
+    data = {
+        "title": title,
+        "body": content,
+    }
     for pair in filter(
         lambda pairs: pairs[0].startswith("BARK_")
         and pairs[0] != "BARK_PUSH"
-        and (pairs[1] or kwargs.get(pairs[0]))
+        and pairs[1]
         and bark_params.get(pairs[0]),
         push_config.items(),
     ):
-        value = kwargs.get(pair[0], pair[1])
+        data[bark_params.get(pair[0])] = pair[1]
-        params += f"{bark_params.get(pair[0])}={value}&"
+    headers = {"Content-Type": "application/json;charset=utf-8"}
-    if params:
+    response = requests.post(
-        url = url + "?" + params.rstrip("&")
+        url=url, data=json.dumps(data), headers=headers, timeout=15
-    response = requests.get(url).json()
+    ).json()
 
     if response["code"] == 200:
         print("bark 推送成功！")
@@ -165,40 +171,31 @@ def bark(title: str, content: str, **kwargs) -> None:
         print("bark 推送失败！")
 
 
-def console(title: str, content: str, **kwargs) -> None:
+def console(title: str, content: str) -> None:
     """
     使用 控制台 推送消息。
     """
     print(f"{title}\n\n{content}")
 
 
-def dingding_bot(title: str, content: str, **kwargs) -> None:
+def dingding_bot(title: str, content: str) -> None:
     """
     使用 钉钉机器人 推送消息。
     """
-    if not (
+    if not push_config.get("DD_BOT_SECRET") or not push_config.get("DD_BOT_TOKEN"):
-        (kwargs.get("DD_BOT_SECRET") and kwargs.get("DD_BOT_TOKEN"))
-        or (push_config.get("DD_BOT_SECRET") and push_config.get("DD_BOT_TOKEN"))
-    ):
         print("钉钉机器人 服务的 DD_BOT_SECRET 或者 DD_BOT_TOKEN 未设置!!\n取消推送")
         return
     print("钉钉机器人 服务启动")
-    if kwargs.get("DD_BOT_SECRET") and kwargs.get("DD_BOT_TOKEN"):
-        DD_BOT_SECRET = kwargs.get("DD_BOT_SECRET")
-        DD_BOT_TOKEN = kwargs.get("DD_BOT_TOKEN")
-    else:
-        DD_BOT_SECRET = push_config.get("DD_BOT_SECRET")
-        DD_BOT_TOKEN = push_config.get("DD_BOT_TOKEN")
 
     timestamp = str(round(time.time() * 1000))
-    secret_enc = DD_BOT_SECRET.encode("utf-8")
+    secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8")
-    string_to_sign = "{}\n{}".format(timestamp, DD_BOT_SECRET)
+    string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET"))
     string_to_sign_enc = string_to_sign.encode("utf-8")
     hmac_code = hmac.new(
         secret_enc, string_to_sign_enc, digestmod=hashlib.sha256
     ).digest()
     sign = urllib.parse.quote_plus(base64.b64encode(hmac_code))
-    url = f"https://oapi.dingtalk.com/robot/send?access_token={DD_BOT_TOKEN}&timestamp={timestamp}&sign={sign}"
+    url = f'https://oapi.dingtalk.com/robot/send?access_token={push_config.get("DD_BOT_TOKEN")}&timestamp={timestamp}&sign={sign}'
     headers = {"Content-Type": "application/json;charset=utf-8"}
     data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
     response = requests.post(
@@ -211,46 +208,35 @@ def dingding_bot(title: str, content: str, **kwargs) -> None:
         print("钉钉机器人 推送失败！")
 
 
-def feishu_bot(title: str, content: str, **kwargs) -> None:
+def feishu_bot(title: str, content: str) -> None:
     """
     使用 飞书机器人 推送消息。
     """
-    if not (kwargs.get("DD_BOT_SECRET") or push_config.get("FSKEY")):
+    if not push_config.get("FSKEY"):
         print("飞书 服务的 FSKEY 未设置!!\n取消推送")
         return
     print("飞书 服务启动")
-    FSKEY = kwargs.get("DD_BOT_SECRET", push_config.get("FSKEY"))
+
-    url = f"https://open.feishu.cn/open-apis/bot/v2/hook/{FSKEY}"
+    url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}'
     data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
     response = requests.post(url, data=json.dumps(data)).json()
 
-    if response.get("StatusCode") == 0:
+    if response.get("StatusCode") == 0 or response.get("code") == 0:
         print("飞书 推送成功！")
     else:
         print("飞书 推送失败！错误信息如下：\n", response)
 
 
-def go_cqhttp(title: str, content: str, **kwargs) -> None:
+def go_cqhttp(title: str, content: str) -> None:
     """
     使用 go_cqhttp 推送消息。
     """
-    if not (
+    if not push_config.get("GOBOT_URL") or not push_config.get("GOBOT_QQ"):
-        (kwargs.get("GOBOT_URL") and kwargs.get("GOBOT_QQ"))
-        or (push_config.get("GOBOT_URL") and push_config.get("GOBOT_QQ"))
-    ):
         print("go-cqhttp 服务的 GOBOT_URL 或 GOBOT_QQ 未设置!!\n取消推送")
         return
     print("go-cqhttp 服务启动")
-    if kwargs.get("GOBOT_URL") and kwargs.get("GOBOT_QQ"):
-        GOBOT_URL = kwargs.get("GOBOT_URL")
-        GOBOT_QQ = kwargs.get("GOBOT_QQ")
-        GOBOT_TOKEN = kwargs.get("GOBOT_TOKEN")
-    else:
-        GOBOT_URL = push_config.get("GOBOT_URL")
-        GOBOT_QQ = push_config.get("GOBOT_QQ")
-        GOBOT_TOKEN = push_config.get("GOBOT_TOKEN")
 
-    url = f"{GOBOT_URL}?access_token={GOBOT_TOKEN}&{GOBOT_QQ}&message=标题:{title}\n内容:{content}"
+    url = f'{push_config.get("GOBOT_URL")}?access_token={push_config.get("GOBOT_TOKEN")}&{push_config.get("GOBOT_QQ")}&message=标题:{title}\n内容:{content}'
     response = requests.get(url).json()
 
     if response["status"] == "ok":
@@ -259,31 +245,20 @@ def go_cqhttp(title: str, content: str, **kwargs) -> None:
         print("go-cqhttp 推送失败！")
 
 
-def gotify(title: str, content: str, **kwargs) -> None:
+def gotify(title: str, content: str) -> None:
     """
     使用 gotify 推送消息。
     """
-    if not (
+    if not push_config.get("GOTIFY_URL") or not push_config.get("GOTIFY_TOKEN"):
-        (kwargs.get("GOTIFY_URL") and kwargs.get("GOTIFY_TOKEN"))
-        or (push_config.get("GOTIFY_URL") and push_config.get("GOTIFY_TOKEN"))
-    ):
         print("gotify 服务的 GOTIFY_URL 或 GOTIFY_TOKEN 未设置!!\n取消推送")
         return
     print("gotify 服务启动")
-    if kwargs.get("GOTIFY_URL") and kwargs.get("GOTIFY_TOKEN"):
-        GOTIFY_URL = kwargs.get("GOTIFY_URL")
-        GOTIFY_TOKEN = kwargs.get("GOBOTGOTIFY_TOKEN_QQ")
-        GOTIFY_PRIORITY = kwargs.get("GOTIFY_PRIORITY")
-    else:
-        GOTIFY_URL = push_config.get("GOTIFY_URL")
-        GOTIFY_TOKEN = push_config.get("GOTIFY_TOKEN")
-        GOTIFY_PRIORITY = kwargs.get("GOTIFY_PRIORITY")
 
-    url = f"{GOTIFY_URL}/message?token={GOTIFY_TOKEN}"
+    url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
     data = {
         "title": title,
         "message": content,
-        "priority": GOTIFY_PRIORITY,
+        "priority": push_config.get("GOTIFY_PRIORITY"),
     }
     response = requests.post(url, data=data).json()
 
@@ -293,16 +268,16 @@ def gotify(title: str, content: str, **kwargs) -> None:
         print("gotify 推送失败！")
 
 
-def iGot(title: str, content: str, **kwargs) -> None:
+def iGot(title: str, content: str) -> None:
     """
     使用 iGot 推送消息。
     """
-    if not (kwargs.get("IGOT_PUSH_KEY") or push_config.get("IGOT_PUSH_KEY")):
+    if not push_config.get("IGOT_PUSH_KEY"):
         print("iGot 服务的 IGOT_PUSH_KEY 未设置!!\n取消推送")
         return
     print("iGot 服务启动")
-    IGOT_PUSH_KEY = kwargs.get("IGOT_PUSH_KEY", push_config.get("IGOT_PUSH_KEY"))
+
-    url = f"https://push.hellyw.com/{IGOT_PUSH_KEY}"
+    url = f'https://push.hellyw.com/{push_config.get("IGOT_PUSH_KEY")}'
     data = {"title": title, "content": content}
     headers = {"Content-Type": "application/x-www-form-urlencoded"}
     response = requests.post(url, data=data, headers=headers).json()
@@ -313,21 +288,20 @@ def iGot(title: str, content: str, **kwargs) -> None:
         print(f'iGot 推送失败！{response["errMsg"]}')
 
 
-def serverJ(title: str, content: str, **kwargs) -> None:
+def serverJ(title: str, content: str) -> None:
     """
     通过 serverJ 推送消息。
     """
-    if not (kwargs.get("PUSH_KEY") or push_config.get("PUSH_KEY")):
+    if not push_config.get("PUSH_KEY"):
         print("serverJ 服务的 PUSH_KEY 未设置!!\n取消推送")
         return
     print("serverJ 服务启动")
-    PUSH_KEY = kwargs.get("PUSH_KEY", push_config.get("PUSH_KEY"))
 
     data = {"text": title, "desp": content.replace("\n", "\n\n")}
-    if PUSH_KEY.find("SCT") != -1:
+    if push_config.get("PUSH_KEY").find("SCT") != -1:
-        url = f"https://sctapi.ftqq.com/{PUSH_KEY}.send"
+        url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send'
     else:
-        url = f"https://sc.ftqq.com/{PUSH_KEY}.send"
+        url = f'https://sc.ftqq.com/{push_config.get("PUSH_KEY")}.send'
     response = requests.post(url, data=data).json()
 
     if response.get("errno") == 0 or response.get("code") == 0:
@@ -336,27 +310,23 @@ def serverJ(title: str, content: str, **kwargs) -> None:
         print(f'serverJ 推送失败！错误码：{response["message"]}')
 
 
-def pushdeer(title: str, content: str, **kwargs) -> None:
+def pushdeer(title: str, content: str) -> None:
     """
     通过PushDeer 推送消息
     """
-    if not (kwargs.get("DEER_KEY") or push_config.get("DEER_KEY")):
+    if not push_config.get("DEER_KEY"):
         print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
         return
     print("PushDeer 服务启动")
-    DEER_KEY = kwargs.get("DEER_KEY", push_config.get("DEER_KEY"))
-
     data = {
         "text": title,
         "desp": content,
         "type": "markdown",
-        "pushkey": DEER_KEY,
+        "pushkey": push_config.get("DEER_KEY"),
     }
     url = "https://api2.pushdeer.com/message/push"
     if push_config.get("DEER_URL"):
         url = push_config.get("DEER_URL")
-    if kwargs.get("DEER_URL"):
-        url = kwargs.get("DEER_URL")
 
     response = requests.post(url, data=data).json()
 
@@ -366,26 +336,16 @@ def pushdeer(title: str, content: str, **kwargs) -> None:
         print("PushDeer 推送失败！错误信息：", response)
 
 
-def chat(title: str, content: str, **kwargs) -> None:
+def chat(title: str, content: str) -> None:
     """
     通过Chat 推送消息
     """
-    if not (
+    if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"):
-        (kwargs.get("CHAT_URL") and kwargs.get("CHAT_TOKEN"))
-        or (push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"))
-    ):
         print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
         return
     print("chat 服务启动")
-    if kwargs.get("CHAT_URL") and kwargs.get("CHAT_TOKEN"):
-        CHAT_URL = kwargs.get("CHAT_URL")
-        CHAT_TOKEN = kwargs.get("CHAT_TOKEN")
-    else:
-        CHAT_URL = push_config.get("CHAT_URL")
-        CHAT_TOKEN = push_config.get("CHAT_TOKEN")
-
     data = "payload=" + json.dumps({"text": title + "\n" + content})
-    url = CHAT_URL + CHAT_TOKEN
+    url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
     response = requests.post(url, data=data)
 
     if response.status_code == 200:
@@ -394,23 +354,21 @@ def chat(title: str, content: str, **kwargs) -> None:
         print("Chat 推送失败！错误信息：", response)
 
 
-def pushplus_bot(title: str, content: str, **kwargs) -> None:
+def pushplus_bot(title: str, content: str) -> None:
     """
     通过 push+ 推送消息。
     """
-    if not (kwargs.get("PUSH_PLUS_TOKEN") or push_config.get("PUSH_PLUS_TOKEN")):
+    if not push_config.get("PUSH_PLUS_TOKEN"):
         print("PUSHPLUS 服务的 PUSH_PLUS_TOKEN 未设置!!\n取消推送")
         return
     print("PUSHPLUS 服务启动")
-    PUSH_PLUS_TOKEN = kwargs.get("PUSH_PLUS_TOKEN", push_config.get("PUSH_PLUS_TOKEN"))
-    PUSH_PLUS_USER = kwargs.get("PUSH_PLUS_USER", push_config.get("PUSH_PLUS_USER"))
 
     url = "http://www.pushplus.plus/send"
     data = {
-        "token": PUSH_PLUS_TOKEN,
+        "token": push_config.get("PUSH_PLUS_TOKEN"),
         "title": title,
         "content": content,
-        "topic": PUSH_PLUS_USER,
+        "topic": push_config.get("PUSH_PLUS_USER"),
     }
     body = json.dumps(data).encode(encoding="utf-8")
     headers = {"Content-Type": "application/json"}
@@ -431,25 +389,48 @@ def pushplus_bot(title: str, content: str, **kwargs) -> None:
             print("PUSHPLUS 推送失败！")
 
 
-def qmsg_bot(title: str, content: str, **kwargs) -> None:
+def weplus_bot(title: str, content: str) -> None:
+    """
+    通过 微加机器人 推送消息。
+    """
+    if not push_config.get("WE_PLUS_BOT_TOKEN"):
+        print("微加机器人 服务的 WE_PLUS_BOT_TOKEN 未设置!!\n取消推送")
+        return
+    print("微加机器人 服务启动")
+
+    template = "txt"
+    if len(content) > 800:
+        template = "html"
+
+    url = "https://www.weplusbot.com/send"
+    data = {
+        "token": push_config.get("WE_PLUS_BOT_TOKEN"),
+        "title": title,
+        "content": content,
+        "template": template,
+        "receiver": push_config.get("WE_PLUS_BOT_RECEIVER"),
+        "version": push_config.get("WE_PLUS_BOT_VERSION"),
+    }
+    body = json.dumps(data).encode(encoding="utf-8")
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, data=body, headers=headers).json()
+
+    if response["code"] == 200:
+        print("微加机器人 推送成功！")
+    else:
+        print("微加机器人 推送失败！")
+
+
+def qmsg_bot(title: str, content: str) -> None:
     """
     使用 qmsg 推送消息。
     """
-    if not (
+    if not push_config.get("QMSG_KEY") or not push_config.get("QMSG_TYPE"):
-        (kwargs.get("QMSG_KEY") and kwargs.get("QMSG_TYPE"))
-        or (push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"))
-    ):
         print("qmsg 的 QMSG_KEY 或者 QMSG_TYPE 未设置!!\n取消推送")
         return
     print("qmsg 服务启动")
-    if kwargs.get("QMSG_KEY") and kwargs.get("QMSG_TYPE"):
-        QMSG_KEY = kwargs.get("QMSG_KEY")
-        QMSG_TYPE = kwargs.get("QMSG_TYPE")
-    else:
-        QMSG_KEY = push_config.get("QMSG_KEY")
-        QMSG_TYPE = push_config.get("QMSG_TYPE")
 
-    url = f"https://qmsg.zendee.cn/{QMSG_TYPE}/{QMSG_KEY}"
+    url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}'
     payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
     response = requests.post(url=url, params=payload).json()
 
@@ -459,15 +440,14 @@ def qmsg_bot(title: str, content: str, **kwargs) -> None:
         print(f'qmsg 推送失败！{response["reason"]}')
 
 
-def wecom_app(title: str, content: str, **kwargs) -> None:
+def wecom_app(title: str, content: str) -> None:
     """
     通过 企业微信 APP 推送消息。
     """
-    if not (kwargs.get("QYWX_AM") or push_config.get("QYWX_AM")):
+    if not push_config.get("QYWX_AM"):
         print("QYWX_AM 未设置!!\n取消推送")
         return
-    QYWX_AM = kwargs.get("QYWX_AM", push_config.get("QYWX_AM"))
+    QYWX_AM_AY = re.split(",", push_config.get("QYWX_AM"))
-    QYWX_AM_AY = re.split(",", QYWX_AM)
     if 4 < len(QYWX_AM_AY) > 5:
         print("QYWX_AM 设置错误!!\n取消推送")
         return
@@ -557,23 +537,20 @@ class WeCom:
         return respone["errmsg"]
 
 
-def wecom_bot(title: str, content: str, **kwargs) -> None:
+def wecom_bot(title: str, content: str) -> None:
     """
     通过 企业微信机器人 推送消息。
     """
-    if not (kwargs.get("QYWX_KEY") or push_config.get("QYWX_KEY")):
+    if not push_config.get("QYWX_KEY"):
         print("企业微信机器人 服务的 QYWX_KEY 未设置!!\n取消推送")
         return
     print("企业微信机器人服务启动")
-    QYWX_KEY = kwargs.get("QYWX_KEY", push_config.get("QYWX_KEY"))
 
     origin = "https://qyapi.weixin.qq.com"
     if push_config.get("QYWX_ORIGIN"):
         origin = push_config.get("QYWX_ORIGIN")
-    if kwargs.get("QYWX_ORIGIN"):
-        origin = kwargs.get("QYWX_ORIGIN")
 
-    url = f"{origin}/cgi-bin/webhook/send?key={QYWX_KEY}"
+    url = f"{origin}/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
     headers = {"Content-Type": "application/json;charset=utf-8"}
     data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
     response = requests.post(
@@ -586,53 +563,40 @@ def wecom_bot(title: str, content: str, **kwargs) -> None:
         print("企业微信机器人推送失败！")
 
 
-def telegram_bot(title: str, content: str, **kwargs) -> None:
+def telegram_bot(title: str, content: str) -> None:
     """
     使用 telegram 机器人 推送消息。
     """
-    if not (
+    if not push_config.get("TG_BOT_TOKEN") or not push_config.get("TG_USER_ID"):
-        (kwargs.get("TG_BOT_TOKEN") and kwargs.get("TG_USER_ID"))
+        print("tg 服务的 bot_token 或者 user_id 未设置!!\n取消推送")
-        or (push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"))
-    ):
-        print("tg 服务的 TG_BOT_TOKEN 或者 TG_USER_ID 未设置!!\n取消推送")
         return
     print("tg 服务启动")
-    if kwargs.get("TG_BOT_TOKEN") and kwargs.get("TG_USER_ID"):
-        TG_BOT_TOKEN = kwargs.get("TG_BOT_TOKEN")
-        TG_USER_ID = kwargs.get("TG_USER_ID")
-    else:
-        TG_BOT_TOKEN = push_config.get("TG_BOT_TOKEN")
-        TG_USER_ID = push_config.get("TG_USER_ID")
 
-    if kwargs.get("TG_API_HOST") or push_config.get("TG_API_HOST"):
+    if push_config.get("TG_API_HOST"):
-        TG_API_HOST = kwargs.get("TG_API_HOST", push_config.get("TG_API_HOST"))
+        url = f"{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
-        url = f"{TG_API_HOST}/bot{TG_BOT_TOKEN}/sendMessage"
     else:
-        url = f"https://api.telegram.org/bot{TG_BOT_TOKEN}/sendMessage"
+        url = (
+            f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
+        )
     headers = {"Content-Type": "application/x-www-form-urlencoded"}
     payload = {
-        "chat_id": str(TG_USER_ID),
+        "chat_id": str(push_config.get("TG_USER_ID")),
         "text": f"{title}\n\n{content}",
         "disable_web_page_preview": "true",
     }
     proxies = None
-    if not (
+    if push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"):
-        (kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT"))
+        if push_config.get("TG_PROXY_AUTH") is not None and "@" not in push_config.get(
-        or (push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"))
+            "TG_PROXY_HOST"
         ):
-        if kwargs.get("TG_PROXY_HOST") and kwargs.get("TG_PROXY_PORT"):
+            push_config["TG_PROXY_HOST"] = (
-            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
+                push_config.get("TG_PROXY_AUTH")
-            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
+                + "@"
-        else:
+                + push_config.get("TG_PROXY_HOST")
-            TG_PROXY_HOST = kwargs.get("TG_PROXY_HOST")
+            )
-            TG_PROXY_PORT = kwargs.get("TG_PROXY_PORT")
+        proxyStr = "http://{}:{}".format(
-        if kwargs.get("TG_PROXY_AUTH") or push_config.get("TG_PROXY_AUTH"):
+            push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT")
-            TG_PROXY_AUTH = kwargs.get(
-                "TG_PROXY_AUTH", push_config.get("TG_PROXY_AUTH")
         )
-        if TG_PROXY_AUTH is not None and "@" not in TG_PROXY_HOST:
-            TG_PROXY_HOST = TG_PROXY_AUTH + "@" + TG_PROXY_HOST
-        proxyStr = "http://{}:{}".format(TG_PROXY_HOST, TG_PROXY_PORT)
         proxies = {"http": proxyStr, "https": proxyStr}
     response = requests.post(
         url=url, headers=headers, params=payload, proxies=proxies
@@ -644,51 +608,33 @@ def telegram_bot(title: str, content: str, **kwargs) -> None:
         print("tg 推送失败！")
 
 
-def aibotk(title: str, content: str, **kwargs) -> None:
+def aibotk(title: str, content: str) -> None:
     """
     使用 智能微秘书 推送消息。
     """
-    if not (
+    if (
-        (
+        not push_config.get("AIBOTK_KEY")
-            kwargs.get("AIBOTK_KEY")
+        or not push_config.get("AIBOTK_TYPE")
-            and kwargs.get("AIBOTK_TYPE")
+        or not push_config.get("AIBOTK_NAME")
-            and kwargs.get("AIBOTK_NAME")
-        )
-        or (
-            push_config.get("AIBOTK_KEY")
-            and push_config.get("AIBOTK_TYPE")
-            and push_config.get("AIBOTK_NAME")
-        )
     ):
         print(
             "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送"
         )
         return
     print("智能微秘书 服务启动")
-    if (
+
-        kwargs.get("AIBOTK_KEY")
+    if push_config.get("AIBOTK_TYPE") == "room":
-        and kwargs.get("AIBOTK_TYPE")
-        and kwargs.get("AIBOTK_NAME")
-    ):
-        AIBOTK_KEY = kwargs.get("AIBOTK_KEY")
-        AIBOTK_TYPE = kwargs.get("AIBOTK_TYPE")
-        AIBOTK_NAME = kwargs.get("AIBOTK_NAME")
-    else:
-        AIBOTK_KEY = push_config.get("AIBOTK_KEY")
-        AIBOTK_TYPE = push_config.get("AIBOTK_TYPE")
-        AIBOTK_NAME = push_config.get("AIBOTK_NAME")
-    if AIBOTK_TYPE == "room":
         url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
         data = {
-            "apiKey": AIBOTK_KEY,
+            "apiKey": push_config.get("AIBOTK_KEY"),
-            "roomName": AIBOTK_NAME,
+            "roomName": push_config.get("AIBOTK_NAME"),
             "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
         }
     else:
         url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
         data = {
-            "apiKey": AIBOTK_KEY,
+            "apiKey": push_config.get("AIBOTK_KEY"),
-            "name": AIBOTK_NAME,
+            "name": push_config.get("AIBOTK_NAME"),
             "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
         }
     body = json.dumps(data).encode(encoding="utf-8")
@@ -701,75 +647,50 @@ def aibotk(title: str, content: str, **kwargs) -> None:
         print(f'智能微秘书 推送失败！{response["error"]}')
 
 
-def smtp(title: str, content: str, **kwargs) -> None:
+def smtp(title: str, content: str) -> None:
     """
     使用 SMTP 邮件 推送消息。
     """
-    if not (
+    if (
-        (
+        not push_config.get("SMTP_SERVER")
-            kwargs.get("SMTP_SERVER")
+        or not push_config.get("SMTP_SSL")
-            and kwargs.get("SMTP_SSL")
+        or not push_config.get("SMTP_EMAIL")
-            and kwargs.get("SMTP_EMAIL")
+        or not push_config.get("SMTP_PASSWORD")
-            and kwargs.get("SMTP_PASSWORD")
+        or not push_config.get("SMTP_NAME")
-            and kwargs.get("SMTP_NAME")
-        )
-        or (
-            push_config.get("SMTP_SERVER")
-            and push_config.get("SMTP_SSL")
-            and push_config.get("SMTP_EMAIL")
-            and push_config.get("SMTP_PASSWORD")
-            and push_config.get("SMTP_NAME")
-        )
     ):
         print(
             "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
         )
         return
     print("SMTP 邮件 服务启动")
-    if (
-        kwargs.get("SMTP_SERVER")
-        and kwargs.get("SMTP_SSL")
-        and kwargs.get("SMTP_EMAIL")
-        and kwargs.get("SMTP_PASSWORD")
-        and kwargs.get("SMTP_NAME")
-    ):
-        SMTP_SERVER = kwargs.get("SMTP_SERVER")
-        SMTP_SSL = kwargs.get("SMTP_SSL")
-        SMTP_EMAIL = kwargs.get("SMTP_EMAIL")
-        SMTP_PASSWORD = kwargs.get("SMTP_PASSWORD")
-        SMTP_NAME = kwargs.get("SMTP_NAME")
-    else:
-        SMTP_SERVER = push_config.get("SMTP_SERVER")
-        SMTP_SSL = push_config.get("SMTP_SSL")
-        SMTP_EMAIL = push_config.get("SMTP_EMAIL")
-        SMTP_PASSWORD = push_config.get("SMTP_PASSWORD")
-        SMTP_NAME = push_config.get("SMTP_NAME")
 
     message = MIMEText(content, "plain", "utf-8")
     message["From"] = formataddr(
         (
-            Header(SMTP_NAME, "utf-8").encode(),
+            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
-            SMTP_EMAIL,
+            push_config.get("SMTP_EMAIL"),
         )
     )
     message["To"] = formataddr(
         (
-            Header(SMTP_NAME, "utf-8").encode(),
+            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
-            SMTP_EMAIL,
+            push_config.get("SMTP_EMAIL"),
         )
     )
     message["Subject"] = Header(title, "utf-8")
 
     try:
         smtp_server = (
-            smtplib.SMTP_SSL(SMTP_SERVER)
+            smtplib.SMTP_SSL(push_config.get("SMTP_SERVER"))
-            if SMTP_SSL == "true"
+            if push_config.get("SMTP_SSL") == "true"
-            else smtplib.SMTP(SMTP_SERVER)
+            else smtplib.SMTP(push_config.get("SMTP_SERVER"))
+        )
+        smtp_server.login(
+            push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD")
         )
-        smtp_server.login(SMTP_EMAIL, SMTP_PASSWORD)
         smtp_server.sendmail(
-            SMTP_EMAIL,
+            push_config.get("SMTP_EMAIL"),
-            SMTP_EMAIL,
+            push_config.get("SMTP_EMAIL"),
             message.as_bytes(),
         )
         smtp_server.close()
@@ -778,20 +699,26 @@ def smtp(title: str, content: str, **kwargs) -> None:
         print(f"SMTP 邮件 推送失败！{e}")
 
 
-def pushme(title: str, content: str, **kwargs) -> None:
+def pushme(title: str, content: str) -> None:
     """
     使用 PushMe 推送消息。
     """
-    if not (kwargs.get("PUSHME_KEY") or push_config.get("PUSHME_KEY")):
+    if not push_config.get("PUSHME_KEY"):
         print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送")
         return
     print("PushMe 服务启动")
-    PUSHME_KEY = kwargs.get("PUSHME_KEY", push_config.get("PUSHME_KEY"))
 
-    url = f"https://push.i-i.me/?push_key={PUSHME_KEY}"
+    url = (
+        push_config.get("PUSHME_URL")
+        if push_config.get("PUSHME_URL")
+        else "https://push.i-i.me/"
+    )
     data = {
+        "push_key": push_config.get("PUSHME_KEY"),
         "title": title,
         "content": content,
+        "date": push_config.get("date") if push_config.get("date") else "",
+        "type": push_config.get("type") if push_config.get("type") else "",
     }
     response = requests.post(url, data=data)
 
@@ -801,45 +728,27 @@ def pushme(title: str, content: str, **kwargs) -> None:
         print(f"PushMe 推送失败！{response.status_code} {response.text}")
 
 
-def chronocat(title: str, content: str, **kwargs) -> None:
+def chronocat(title: str, content: str) -> None:
     """
     使用 CHRONOCAT 推送消息。
     """
-    if not (
+    if (
-        (
+        not push_config.get("CHRONOCAT_URL")
-            push_config.get("CHRONOCAT_URL")
+        or not push_config.get("CHRONOCAT_QQ")
-            and push_config.get("CHRONOCAT_QQ")
+        or not push_config.get("CHRONOCAT_TOKEN")
-            and push_config.get("CHRONOCAT_TOKEN")
-        )
-        or (
-            push_config.get("CHRONOCAT_URL")
-            and push_config.get("CHRONOCAT_QQ")
-            and push_config.get("CHRONOCAT_TOKEN")
-        )
     ):
         print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
         return
+
     print("CHRONOCAT 服务启动")
-    if (
-        kwargs.get("CHRONOCAT_URL")
-        and kwargs.get("CHRONOCAT_QQ")
-        and kwargs.get("CHRONOCAT_TOKEN")
-    ):
-        CHRONOCAT_URL = kwargs.get("CHRONOCAT_URL")
-        CHRONOCAT_QQ = kwargs.get("CHRONOCAT_QQ")
-        CHRONOCAT_TOKEN = kwargs.get("CHRONOCAT_TOKEN")
-    else:
-        CHRONOCAT_URL = push_config.get("CHRONOCAT_URL")
-        CHRONOCAT_QQ = push_config.get("CHRONOCAT_QQ")
-        CHRONOCAT_TOKEN = push_config.get("CHRONOCAT_TOKEN")
 
-    user_ids = re.findall(r"user_id=(\d+)", CHRONOCAT_QQ)
+    user_ids = re.findall(r"user_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
-    group_ids = re.findall(r"group_id=(\d+)", CHRONOCAT_QQ)
+    group_ids = re.findall(r"group_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
 
-    url = f"{CHRONOCAT_URL}/api/message/send"
+    url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send'
     headers = {
         "Content-Type": "application/json",
-        "Authorization": f"Bearer {CHRONOCAT_TOKEN}",
+        "Authorization": f'Bearer {push_config.get("CHRONOCAT_TOKEN")}',
     }
 
     for chat_type, ids in [(1, user_ids), (2, group_ids)]:
@@ -904,12 +813,12 @@ def parse_string(input_string, value_format_fn=None):
 
 def parse_body(body, content_type, value_format_fn=None):
     if not body or content_type == "text/plain":
-        return body
+        return value_format_fn(body) if value_format_fn and body else body
 
-    parsed = parse_string(input_string, value_format_fn)
+    parsed = parse_string(body, value_format_fn)
 
     if content_type == "application/x-www-form-urlencoded":
-        data = urlencode(parsed, doseq=True)
+        data = urllib.parse.urlencode(parsed, doseq=True)
         return data
 
     if content_type == "application/json":
@@ -919,18 +828,6 @@ def parse_body(body, content_type, value_format_fn=None):
     return parsed
 
 
-def format_notify_content(url, body, title, content):
-    if "$title" not in url and "$title" not in body:
-        return {}
-
-    formatted_url = url.replace("$title", urllib.parse.quote_plus(title)).replace(
-        "$content", urllib.parse.quote_plus(content)
-    )
-    formatted_body = body.replace("$title", title).replace("$content", content)
-
-    return formatted_url, formatted_body
-
-
 def custom_notify(title: str, content: str) -> None:
     """
     通过 自定义通知 推送消息。
@@ -961,7 +858,7 @@ def custom_notify(title: str, content: str) -> None:
         "$title", urllib.parse.quote_plus(title)
     ).replace("$content", urllib.parse.quote_plus(content))
     response = requests.request(
-        method=WEBHOOK_METHOD, url=formatUrl, headers=headers, timeout=15, data=body
+        method=WEBHOOK_METHOD, url=formatted_url, headers=headers, timeout=15, data=body
     )
 
     if response.status_code == 200:
@@ -981,6 +878,7 @@ def one() -> str:
 
 
 def add_notify_function():
+    notify_function = []
     if push_config.get("BARK_PUSH"):
         notify_function.append(bark)
     if push_config.get("CONSOLE"):
@@ -1003,6 +901,8 @@ def add_notify_function():
         notify_function.append(chat)
     if push_config.get("PUSH_PLUS_TOKEN"):
         notify_function.append(pushplus_bot)
+    if push_config.get("WE_PLUS_BOT_TOKEN"):
+        notify_function.append(weplus_bot)
     if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
         notify_function.append(qmsg_bot)
     if push_config.get("QYWX_AM"):
@@ -1036,8 +936,19 @@ def add_notify_function():
     if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
         notify_function.append(custom_notify)
 
+    if not notify_function:
+        print(f"无推送渠道，请检查通知变量是否正确")
+    return notify_function
+
+
+def send(title: str, content: str, ignore_default_config: bool = False, **kwargs):
+    if kwargs:
+        global push_config
+        if ignore_default_config:
+            push_config = kwargs  # 清空从环境变量获取的配置
+        else:
+            push_config.update(kwargs)
 
-def send(title: str, content: str, **kwargs) -> None:
     if not content:
         print(f"{title} 推送内容为空！")
         return
@@ -1050,13 +961,11 @@ def send(title: str, content: str, **kwargs) -> None:
             return
 
     hitokoto = push_config.get("HITOKOTO")
-    content += "\n\n" + one() if hitokoto else ""
+    content += "\n\n" + one() if hitokoto != "false" else ""
 
-    add_notify_function()
+    notify_function = add_notify_function()
     ts = [
-        threading.Thread(
+        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
-            target=mode, args=(title, content), kwargs=kwargs, name=mode.__name__
-        )
         for mode in notify_function
     ]
     [t.start() for t in ts]

sample/ql_sample.js

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

sample/ql_sample.py

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

shell/share.sh

@@ -4,6 +4,11 @@
 dir_root=$QL_DIR
 dir_tmp=$dir_root/.tmp
 dir_data=$dir_root/data
+
+if [[ $QL_DATA_DIR ]]; then
+  dir_data="${QL_DATA_DIR%/}"
+fi
+
 dir_shell=$dir_root/shell
 dir_sample=$dir_root/sample
 dir_static=$dir_root/static
@@ -33,8 +38,12 @@ file_task_sample=$dir_sample/task.sample.sh
 file_extra_sample=$dir_sample/extra.sample.sh
 file_notify_js_sample=$dir_sample/notify.js
 file_notify_py_sample=$dir_sample/notify.py
+file_test_js_sample=$dir_sample/ql_sample.js
+file_test_py_sample=$dir_sample/ql_sample.py
 file_notify_py=$dir_scripts/notify.py
 file_notify_js=$dir_scripts/sendNotify.js
+file_test_js=$dir_scripts/ql_sample.js
+file_test_py=$dir_scripts/ql_sample.py
 nginx_app_conf=$dir_root/docker/front.conf
 nginx_conf=$dir_root/docker/nginx.conf
 dep_notify_py=$dir_dep/notify.py
@@ -50,11 +59,11 @@ list_own_drop=$dir_list_tmp/own_drop.list
 
 ## 软连接及其原始文件对应关系
 link_name=(
-  task
+  # task
   ql
 )
 original_name=(
-  task.sh
+  # task.sh
   update.sh
 )
 
@@ -65,7 +74,9 @@ init_env() {
 
 import_config() {
   [[ -f $file_config_user ]] && . $file_config_user
-  [[ -f $file_env ]] && . $file_env
+  if [[ $LOAD_ENV != 'false' ]] && [[ -f $file_env ]]; then
+    . $file_env
+  fi
 
   ql_base_url=${QlBaseUrl:-"/"}
   ql_port=${QlPort:-"5700"}
@@ -125,53 +136,6 @@ gen_random_num() {
   echo $((${RANDOM} % $divi))
 }
 
-link_shell_sub() {
-  local link_path="$1"
-  local original_path="$2"
-  if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
-    rm -f $link_path 2>/dev/null
-    ln -sf $original_path $link_path
-  fi
-}
-
-link_shell() {
-  if [[ $is_termux -eq 1 ]]; then
-    local path="/data/data/com.termux/files/usr/bin/"
-  elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
-    local path="/usr/local/bin/"
-  else
-    local path=""
-    echo -e "脚本功能受限，请自行添加命令的软连接...\n"
-  fi
-  if [[ $path ]]; then
-    for ((i = 0; i < ${#link_name[*]}; i++)); do
-      link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
-    done
-  fi
-}
-
-define_cmd() {
-  local cmd_prefix cmd_suffix
-  if type task &>/dev/null; then
-    cmd_suffix=""
-    if [[ -f "$dir_shell/task.sh" ]]; then
-      cmd_prefix=""
-    else
-      cmd_prefix="bash "
-    fi
-  else
-    cmd_suffix=".sh"
-    if [[ -f "$dir_shell/task.sh" ]]; then
-      cmd_prefix="$dir_shell/"
-    else
-      cmd_prefix="bash $dir_shell/"
-    fi
-  fi
-  for ((i = 0; i < ${#link_name[*]}; i++)); do
-    export cmd_${link_name[i]}="${cmd_prefix}${link_name[i]}${cmd_suffix}"
-  done
-}
-
 fix_config() {
   make_dir $dir_tmp
   make_dir $dir_static
@@ -234,6 +198,16 @@ fix_config() {
     echo
   fi
 
+  if [[ ! -s $file_test_js ]]; then
+    cp -fv $file_test_js_sample $file_test_js
+    echo
+  fi
+
+  if [[ ! -s $file_test_py ]]; then
+    cp -fv $file_test_py_sample $file_test_py
+    echo
+  fi
+
   if [[ -s /etc/nginx/conf.d/default.conf ]]; then
     echo -e "检测到默认nginx配置文件，清空...\n"
     cat /dev/null >/etc/nginx/conf.d/default.conf
@@ -382,25 +356,25 @@ patch_version() {
 
   if [[ -d "$dir_root/db" ]]; then
     echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/scripts" ]]; then
     echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-    cp -rf $dir_root/scripts $dir_root/data
+    cp -rf $dir_root/scripts $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/log" ]]; then
     echo -e "检测到旧的log目录，拷贝到data目录...\n"
-    cp -rf $dir_root/log $dir_root/data
+    cp -rf $dir_root/log $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/config" ]]; then
     echo -e "检测到旧的config目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
     echo
   fi
 }
@@ -485,6 +459,5 @@ handle_task_end() {
 init_env
 detect_termux
 detect_macos
-define_cmd
 
 import_config $1

shell/update.sh

@@ -156,21 +156,15 @@ update_raw() {
     autoDelCron=${AutoDelCron}
   fi
 
-  local proxyStr=""
-  if [[ $proxy ]]; then
-    if [[ $url == http:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy}\""
-    elif [[ $url == https:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
-    fi
-  fi
-
   local raw_url="$url"
   local suffix="${raw_url##*.}"
   local raw_file_name="${uniq_path}.${suffix}"
   echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
 
-  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  set_proxy "$proxy"
+  wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  exit_status=$?
+  unset_proxy
 
   if [[ $? -eq 0 ]]; then
     mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
@@ -248,14 +242,14 @@ reload_qinglong() {
   fi
 
   if [[ "$reload_target" == 'data' ]]; then
-    rm -rf ${dir_root}/data/*
+    rm -rf ${dir_data}/*
-    mv -f ${dir_tmp}/data/* ${dir_root}/data/
+    mv -f ${dir_tmp}/data/* ${dir_data}/
   fi
 
   reload_pm2
 }
 
-## 更新qinglong
+## 更新 qinglong
 update_qinglong() {
   rm -rf ${dir_tmp}/*
   local mirror="gitee"
@@ -527,7 +521,7 @@ main() {
   raw)
     get_uniq_path "$p2"
     if [[ -n $p2 ]]; then
-      update_raw "$p2" "$p3" "$p4"
+      update_raw "$p2" "$p3" "$p4" "$p5"
     else
       eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd

src/locales/en-US.json

@@ -336,6 +336,7 @@
   "企业微信应用": "WeChat Work App",
   "智能微秘书": "Smart WeChat Assistant",
   "群晖chat": "Synology Chat",
+  "微加机器人": "WePlusBot",
   "邮箱": "Email",
   "飞书机器人": "Feishu Bot",
   "自定义通知": "Custom Notification",
@@ -357,6 +358,7 @@
   "BARK推送消息的分组，默认为qinglong": "BARK push message grouping, default is qinglong",
   "BARK推送消息的时效性，默认为active": "BARK push message redirecting URL",
   "BARK推送消息的跳转URL": "BARK push message grouping, default is qinglong",
+  "BARK是否保存推送消息": "Does BARK save push messages",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "Telegram Bot token, e.g., 1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "Telegram user ID, e.g., 129xxx206",
   "代理IP": "Proxy IP",
@@ -377,11 +379,15 @@
   "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot information push key, e.g., https://push.hellyw.com/XXXXXXXX",
   "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "After WeChat scan login, one-to-one or one-to-many push using the provided token (your Token). If PUSH_PLUS_USER is not provided, it defaults to one-to-one push. See reference at https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "The 'group code' for one-to-many push (one-to-many push -> your group (if none, create one) -> group code). If you are the creator of the group, you need to click 'View QR code' to scan and bind, otherwise, you won't receive group messages.",
+  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/": "Token, which can be obtained after scanning and logging in, is available under 'My Account' -> 'Settings' -> 'Tokens'. Please refer to the instructions for detailed steps: https://www.weplusbot.com/",
+  "消息接收人": "message recipient",
+  "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "Version, you can specify 'pro' for the Professional version and 'personal' for the Personal version. If left blank, it will default to the Professional version.",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "Email Address",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",
   "PushMe的Key，https://push.i-i.me/": "PushMe key, https://push.i-i.me/",
+  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "The self built PushMeServer message interface address, for example: http://127.0.0.1:3010 If left blank, use the official message interface",
   "请求方法": "Request Method",
   "请求头Content-Type": "Request Header Content-Type",
   "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "Request URL should start with http or https. URL or body must contain $title, $content is optional and corresponds to the API content position.",
@@ -426,7 +432,7 @@
   "创建变量成功": "Variable created successfully",
   "编辑变量": "Edit Variable",
   "加载中...": "Loading...",
-  "夹下所以日志": "Folder and All Subfiles",
+  "夹下所有日志": "Folder and All Subfiles",
   "创建文件夹成功": "Folder created successfully",
   "创建文件成功": "File created successfully",
   "夹及其子文件": "Folder and Its Subfiles",

src/locales/zh-CN.json

@@ -336,6 +336,7 @@
   "企业微信应用": "企业微信应用",
   "智能微秘书": "智能微秘书",
   "群晖chat": "群晖chat",
+  "微加机器人": "微加机器人",
   "邮箱": "邮箱",
   "飞书机器人": "飞书机器人",
   "自定义通知": "自定义通知",
@@ -357,6 +358,7 @@
   "BARK推送消息的分组，默认为qinglong": "BARK推送消息的分组，默认为qinglong",
   "BARK推送消息的时效性，默认为active": "BARK推送消息的时效性，默认为active",
   "BARK推送消息的跳转URL": "BARK推送消息的跳转URL",
+  "BARK是否保存推送消息": "BARK是否保存推送消息",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "telegram用户的id，例如：129xxx206",
   "代理IP": "代理IP",
@@ -377,11 +379,15 @@
   "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX",
   "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
+  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/": "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/",
+  "消息接收人": "消息接收人",
+  "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "邮箱地址",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",
   "PushMe的Key，https://push.i-i.me/": "PushMe的Key，https://push.i-i.me/",
+  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口",
   "请求方法": "请求方法",
   "请求头Content-Type": "请求头Content-Type",
   "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置",
@@ -426,7 +432,7 @@
   "创建变量成功": "创建变量成功",
   "编辑变量": "编辑变量",
   "加载中...": "加载中...",
-  "夹下所以日志": "夹下所以日志",
+  "夹下所有日志": "夹下所有日志",
   "创建文件夹成功": "创建文件夹成功",
   "创建文件成功": "创建文件成功",
   "夹及其子文件": "夹及其子文件",

src/pages/config/index.tsx

@@ -136,6 +136,7 @@ const Config = () => {
             lineNumbersMinChars: 3,
             folding: false,
             glyphMargin: false,
+            accessibilitySupport: 'off'
           }}
           onMount={(editor) => {
             editorRef.current = editor;

src/pages/crontab/detail.tsx

@@ -110,6 +110,7 @@ const CronDetailModal = ({
           minimap: { enabled: false },
           lineNumbersMinChars: 3,
           glyphMargin: false,
+          accessibilitySupport: 'off',
         }}
         onMount={(editor, monaco) => {
           editorRef.current = editor;
@@ -161,8 +162,9 @@ const CronDetailModal = ({
             setValue(data);
           }
         });
-    } else if (result) {
+    } else {
       setValidTabs([validTabs[0]]);
+      setActiveTabKey('log');
     }
   };
 
@@ -173,8 +175,9 @@ const CronDetailModal = ({
         <>
           {intl.get('确认保存文件')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {' '}
             {scriptInfo.filename}
-          </Text>{' '}
+          </Text>
           {intl.get('，保存后不可恢复')}
         </>
       ),
@@ -357,10 +360,15 @@ const CronDetailModal = ({
     <Modal
       title={
         <div className="crontab-title-wrapper">
-          <div style={{ minWidth: 0 }}>
+          <div style={{ minWidth: 0, display: 'flex', alignItems: 'center' }}>
             <Typography.Text
-              style={{ width: '100%' }}
+              style={{ width: 200, boxSizing: 'content-box' }}
-              ellipsis={{ tooltip: currentCron.name }}
+              ellipsis={{
+                onEllipsis(ellipsis) {
+                  return ellipsis;
+                },
+                tooltip: currentCron.name,
+              }}
             >
               {currentCron.name}
             </Typography.Text>

src/pages/crontab/index.less

@@ -81,6 +81,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    gap: 24px;
 
     .operations {
       display: flex;

src/pages/crontab/index.tsx

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

src/pages/log/index.tsx

@@ -120,10 +120,11 @@ const Log = () => {
         <>
           {intl.get('确认删除')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {select}
+            {' '}
+            {select}{' '}
           </Text>
           {intl.get('文件')}
-          {currentNode.type === 'directory' ? intl.get('夹下所以日志') : ''}
+          {currentNode.type === 'directory' ? intl.get('夹下所有日志') : ''}
           {intl.get('，删除后不可恢复')}
         </>
       ),

src/pages/script/editModal.tsx

@@ -242,6 +242,7 @@ const EditModal = ({
             minimap: { enabled: false },
             lineNumbersMinChars: 3,
             glyphMargin: false,
+            accessibilitySupport: 'off'
           }}
           onMount={(editor) => {
             editorRef.current = editor;

src/pages/script/editNameModal.tsx

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

src/pages/script/index.tsx

@@ -218,8 +218,9 @@ const Script = () => {
         <>
           {intl.get('确认保存文件')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {' '}
             {currentNode.title}
-          </Text>{' '}
+          </Text>
           {intl.get('，保存后不可恢复')}
         </>
       ),
@@ -258,7 +259,8 @@ const Script = () => {
         <>
           {intl.get('确认删除')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {select}
+            {' '}
+            {select}{' '}
           </Text>
           {intl.get('文件')}
           {currentNode.type === 'directory' ? intl.get('夹及其子文件') : ''}
@@ -641,6 +643,7 @@ const Script = () => {
                 fontSize: 12,
                 lineNumbersMinChars: 3,
                 glyphMargin: false,
+                accessibilitySupport: 'off'
               }}
               onMount={(editor) => {
                 editorRef.current = editor;

src/pages/setting/dependence.tsx

@@ -48,8 +48,9 @@ const Dependence = () => {
         pick(systemConfig, dataMap[path]),
       )
       .then((res) => {})
-      .catch((error: any) => {
+      .catch(() => {
-        console.log(error);
+        setLoading(false);
+        setLog((p) => `${p}update mirror error`);
       });
   };
 

src/utils/config.ts

@@ -95,6 +95,7 @@ export default {
     { value: 'aibotk', label: intl.get('智能微秘书') },
     { value: 'iGot', label: 'IGot' },
     { value: 'pushPlus', label: 'PushPlus' },
+    { value: 'wePlusBot', label: intl.get('微加机器人') },
     { value: 'chat', label: intl.get('群晖chat') },
     { value: 'email', label: intl.get('邮箱') },
     { value: 'lark', label: intl.get('飞书机器人') },
@@ -190,6 +191,10 @@ export default {
         label: 'barkUrl',
         tip: intl.get('BARK推送消息的跳转URL'),
       },
+      {
+        label: 'barkArchive',
+        tip: intl.get('BARK是否保存推送消息'),
+      },
     ],
     telegramBot: [
       {
@@ -308,6 +313,27 @@ export default {
         ),
       },
     ],
+    wePlusBot: [
+      {
+        label: 'wePlusBotToken',
+        tip: intl.get(
+          '用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/',
+        ),
+        required: true,
+      },
+      {
+        label: 'wePlusBotReceiver',
+        tip: intl.get(
+          '消息接收人',
+        ),
+      },
+      {
+        label: 'wePlusBotVersion',
+        tip: intl.get(
+          '调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版',
+        ),
+      },
+    ],
     lark: [
       {
         label: 'larkKey',
@@ -334,6 +360,11 @@ export default {
         tip: intl.get('PushMe的Key，https://push.i-i.me/'),
         required: true,
       },
+      {
+        label: 'pushMeUrl',
+        tip: intl.get('自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口'),
+        required: false,
+      },
     ],
     chronocat: [
       {

src/utils/http.ts

@@ -1,29 +1,44 @@
-import intl from 'react-intl-universal'
+import intl from 'react-intl-universal';
 import { message } from 'antd';
 import config from './config';
 import { history } from '@umijs/max';
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios, {
+  AxiosError,
+  AxiosInstance,
+  AxiosRequestConfig,
+  AxiosResponse,
+  InternalAxiosRequestConfig,
+} from 'axios';
 
-interface IResponseData {
+export interface IResponseData {
   code?: number;
   data?: any;
   message?: string;
   error?: any;
 }
 
-type Override<
+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 interface ICustomConfig {
+  onError?: (res: AxiosResponse<unknown, any>) => void;
+}
+
 message.config({
   duration: 2,
 });
 
 const time = Date.now();
-const errorHandler = function (error: AxiosError) {
+const errorHandler = function (
+  error: Override<
+    AxiosError<IResponseData>,
+    { config: InternalAxiosRequestConfig & ICustomConfig }
+  >,
+) {
   if (error.response) {
     const msg = error.response.data
       ? error.response.data.message || error.message || error.response.data
@@ -38,6 +53,10 @@ const errorHandler = function (error: AxiosError) {
         history.push('/login');
       }
     } else {
+      if (typeof error.config?.onError === 'function') {
+        return error.config?.onError(error.response);
+      }
+
       message.error({
         content: msg,
         style: { maxWidth: 500, margin: '0 auto' },
@@ -105,21 +124,21 @@ export const request = _request as Override<
   {
     get<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     delete<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     post<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     put<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
   }
 >;

version.yaml

@@ -1,9 +1,8 @@
-version: 2.17.3
+version: 2.17.7
-changeLogLink: https://t.me/jiao_long/404
+changeLogLink: https://t.me/jiao_long/408
-publishTime: 2024-03-29 23:30
+publishTime: 2024-06-30 16:00
 changeLog: |
-  1. python 通知文件支持自定义参数，可由每个脚本控制通知参数配置
+  1. 修复更新任务状态错误
-  2. ql repo 命令复制仓库任务时，保留仓库脚本原始目录层级
+  2. 修复查询系统 health 状态错误
-  3. 修改自定义通知 body 解析逻辑
+  3. 修复更新 linux 镜像源错误
-  4. 修改系统重启逻辑
+  4. npm 包支持 alpine 和 debian、ubuntu，修复 linux 依赖安装命令
-  5. 修改 latest 基础镜像 node 版本为 v20