@whyour/qinglong 2.17.9 → 2.17.10-rc.2

package/docker/310.Dockerfile

@@ -1,6 +1,6 @@
-FROM node:20-slim as nodebuilder
+FROM node:20-slim AS nodebuilder
 
-FROM python:3.10-slim-bullseye as builder
+FROM python:3.10-slim-bullseye AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
 COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@@ -59,7 +59,8 @@ RUN set -x && \
   rm -rf /root/.local/share/pnpm/store && \
   rm -rf /root/.cache && \
   rm -rf /root/.npm && \
-  ulimit -c 0
+  ulimit -c 0 && \
+  pip3 install requests
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \

package/docker/Dockerfile

@@ -1,6 +1,6 @@
-FROM node:20-slim as nodebuilder
+FROM node:20-slim AS nodebuilder
 
-FROM python:3.11-slim-bullseye as builder
+FROM python:3.11-slim-bullseye AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
 COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@@ -20,7 +20,7 @@ ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
 
 ENV PNPM_HOME=/root/.local/share/pnpm \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
   NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
   LANG=C.UTF-8 \
   SHELL=/bin/bash \
@@ -60,7 +60,8 @@ RUN set -x && \
   rm -rf /root/.local/share/pnpm/store && \
   rm -rf /root/.cache && \
   rm -rf /root/.npm && \
-  ulimit -c 0
+  ulimit -c 0 && \
+  pip3 install requests
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.17.9",
+  "version": "2.17.10-rc.2",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -13,11 +13,11 @@
   },
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
-    "start:front": "max dev",
-    "start:back": "nodemon",
     "start:update": "ts-node -P tsconfig.back.json ./back/update.ts",
     "start:public": "ts-node -P tsconfig.back.json ./back/public.ts",
     "start:rpc": "ts-node -P tsconfig.back.json ./back/schedule/index.ts",
+    "start:back": "nodemon",
+    "start:front": "max dev",
     "build:front": "max build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
@@ -75,7 +75,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.8.13",
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^7.12.1",
+    "@sentry/node": "^8.26.0",
     "body-parser": "^1.19.2",
     "celebrate": "^15.0.1",
     "chokidar": "^3.5.3",
@@ -119,11 +119,13 @@
     "ip2region": "2.3.0"
   },
   "devDependencies": {
+    "moment": "2.30.1",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "6.38.22",
     "@monaco-editor/react": "4.2.1",
     "@react-hook/resize-observer": "^1.2.6",
-    "@sentry/react": "^7.12.1",
+    "react-router-dom": "6.26.1",
+    "@sentry/react": "^8.26.0",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/cross-spawn": "^6.0.2",

package/sample/config.sample.sh

@@ -175,8 +175,16 @@ export CHRONOCAT_QQ=""
 export CHRONOCAT_TOKEN=""
 
 ## 16. SMTP
+## JavaScript 参数
 ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 export SMTP_SERVICE=""
+
+## Python 参数
+## SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
+export SMTP_SERVER=""
+## SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
+export SMTP_SSL=""
+
 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
 export SMTP_EMAIL=""
 ## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定

package/sample/notify.js

@@ -817,7 +817,7 @@ function wePlusBotNotify(text, desp) {
     const { WE_PLUS_BOT_TOKEN, WE_PLUS_BOT_RECEIVER, WE_PLUS_BOT_VERSION } =
       push_config;
     if (WE_PLUS_BOT_TOKEN) {
-      const template = 'txt';
+      let template = 'txt';
       if (desp.length > 800) {
         desp = desp.replace(/[\n\r]/g, '<br>');
         template = 'html';

package/shell/api.sh

@@ -6,12 +6,12 @@ create_token() {
   if [[ -f $token_file ]]; then
     token_command="node ${token_file}"
   fi
-  token=$(eval "$token_command")
+  __ql_token__=$(eval "$token_command")
 }
 
 get_token() {
   if [[ -f $file_auth_token ]]; then
-    token=$(cat $file_auth_token | jq -r .value)
+    __ql_token__=$(cat $file_auth_token | jq -r .value)
     local expiration=$(cat $file_auth_token | jq -r .expiration)
     local currentTimeStamp=$(date +%s)
     if [[ $currentTimeStamp -ge $expiration ]]; then
@@ -43,7 +43,7 @@ add_cron_api() {
   local api=$(
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -79,7 +79,7 @@ update_cron_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -111,7 +111,7 @@ update_cron_command_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -136,7 +136,7 @@ del_cron_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
       -X 'DELETE' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -166,7 +166,7 @@ update_cron() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -190,7 +190,7 @@ notify_api() {
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \
@@ -214,7 +214,7 @@ find_cron_api() {
   local api=$(
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
       -H "Accept: application/json" \
-      -H "Authorization: Bearer $token" \
+      -H "Authorization: Bearer ${__ql_token__}" \
       -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
       -H "Origin: http://0.0.0.0:5700" \

package/shell/otask.sh

@@ -210,14 +210,19 @@ run_else() {
 
 check_file() {
   isJsOrPythonFile="false"
-  if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.ts ]]; then
+  if [[ $1 == *.js ]] || [[ $1 == *.mjs ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.ts ]]; then
     isJsOrPythonFile="true"
   fi
   if [[ -f $file_env ]]; then
     get_env_array
     if [[ $isJsOrPythonFile == 'true' ]]; then
-      export NODE_OPTIONS="${NODE_OPTIONS} -r ${file_preload_js}"
-      export PYTHONPATH="${PYTHONPATH}:${dir_preload}:${dir_config}"
+      PREV_NODE_OPTIONS="${NODE_OPTIONS:=}"
+      PREV_PYTHONPATH="${PYTHONPATH:=}"
+      if [[ $1 == *.js ]] || [[ $1 == *.ts ]] || [[ $1 == *.mjs ]]; then
+        export NODE_OPTIONS="${NODE_OPTIONS} -r ${file_preload_js}"
+      else
+        export PYTHONPATH="${PYTHONPATH}:${dir_preload}:${dir_config}"
+      fi
     else
       . $file_env
     fi
@@ -264,7 +269,18 @@ check_file "${task_shell_params[@]}"
 if [[ $isJsOrPythonFile == 'false' ]]; then
   run_task_before "${task_shell_params[@]}"
 fi
+if set -o | grep -q 'nounset.*on'; then
+  set_u_on="true"
+  set +u
+fi
 main "${task_shell_params[@]}"
+if [[ "$set_u_on" == 'true' ]]; then
+  set -u
+fi
+if [[ $isJsOrPythonFile == 'true' ]]; then
+  export NODE_OPTIONS="${PREV_NODE_OPTIONS}"
+  export PYTHONPATH="${PREV_PYTHONPATH}"
+fi
 run_task_after "${task_shell_params[@]}"
 clear_env
 handle_task_end "${task_shell_params[@]}"

package/shell/preload/sitecustomize.js

@@ -1,13 +1,5 @@
 const { execSync } = require('child_process');
-const { sendNotify } = require('./notify.js');
 require(`./env.js`);
-
-function initGlobal() {
-  global.QLAPI = {
-    notify: sendNotify,
-  };
-}
-
 function expandRange(rangeStr, max) {
   const tempRangeStr = rangeStr
     .trim()
@@ -18,7 +10,11 @@ function expandRange(rangeStr, max) {
     const rangeMatch = part.match(/^(\d+)([-~_])(\d+)$/);
     if (rangeMatch) {
       const [, start, , end] = rangeMatch.map(Number);
-      return Array.from({ length: end - start + 1 }, (_, i) => start + i);
+      const step = start < end ? 1 : -1;
+      return Array.from(
+        { length: Math.abs(end - start) + 1 },
+        (_, i) => start + i * step,
+      );
     }
     return Number(part);
   });
@@ -41,10 +37,14 @@ function run() {
     const fileName = process.argv[1].replace(`${dir_scripts}/`, '');
     let command = `bash -c "source ${file_task_before} ${fileName}`;
     if (task_before) {
-      command = `${command} && echo -e '执行前置命令\n' && eval "${task_before}" && echo -e '\n执行前置命令结束\n'`;
+      const escapeTaskBefore = task_before
+        .replace(/"/g, '\\"')
+        .replace(/\$/g, '\\$');
+      command = `${command} && eval '${escapeTaskBefore}'`;
+      console.log('执行前置命令\n');
     }
     const res = execSync(
-      `${command} && echo "${splitStr}" && NODE_OPTIONS= node -p 'JSON.stringify(process.env)'"`,
+      `${command} && echo -e '${splitStr}' && NODE_OPTIONS= node -p 'JSON.stringify(process.env)'"`,
       {
         encoding: 'utf-8',
       },
@@ -55,6 +55,9 @@ function run() {
       process.env[key] = newEnvObject[key];
     }
     console.log(output);
+    if (task_before) {
+      console.log('执行前置命令结束\n');
+    }
   } catch (error) {
     if (!error.message.includes('spawnSync /bin/sh E2BIG')) {
       console.log(`run task before error: `, error);
@@ -71,8 +74,16 @@ function run() {
 }
 
 try {
-  initGlobal();
+  if (!process.argv[1]) {
+    return;
+  }
+
   run();
+
+  const { sendNotify } = require('./notify.js');
+  global.QLAPI = {
+    notify: sendNotify,
+  };
 } catch (error) {
   console.log(`run builtin code error: `, error, '\n');
 }

package/shell/preload/sitecustomize.py

@@ -5,17 +5,6 @@ import json
 import builtins
 import sys
 import env
-from notify import send
-
-
-class BaseApi:
-    def notify(self, *args, **kwargs):
-        return send(*args, **kwargs)
-
-
-def init_global():
-    QLAPI = BaseApi()
-    builtins.QLAPI = QLAPI
 
 
 def try_parse_int(value):
@@ -37,7 +26,8 @@ def expand_range(range_str, max_value):
         range_match = re.match(r"^(\d+)([-~_])(\d+)$", part)
         if range_match:
             start, _, end = map(try_parse_int, range_match.groups())
-            result.extend(range(start, end + 1))
+            step = 1 if start < end else -1
+            result.extend(range(start, end + step, step))
         else:
             result.append(int(part))
 
@@ -54,10 +44,12 @@ def run():
         task_before = os.getenv("task_before")
 
         if task_before:
-            command += f" && echo -e '执行前置命令\n' && eval \"{task_before}\" && echo -e '\n执行前置命令结束\n'"
+            escape_task_before = task_before.replace('"', '\\"').replace("$", "\\$")
+            command += f" && eval '{escape_task_before}'"
+            print("执行前置命令\n")
 
         python_command = "PYTHONPATH= python3 -c 'import os, json; print(json.dumps(dict(os.environ)))'"
-        command += f' && echo "{split_str}" && {python_command}"'
+        command += f" && echo -e '{split_str}' && {python_command}\""
 
         res = subprocess.check_output(command, shell=True, encoding="utf-8")
         output, env_str = res.split(split_str)
@@ -68,6 +60,8 @@ def run():
             os.environ[key] = value
 
         print(output)
+        if task_before:
+            print("执行前置命令结束")
 
     except subprocess.CalledProcessError as error:
         print(f"run task before error: {error}")
@@ -90,7 +84,15 @@ def run():
 
 
 try:
-    init_global()
     run()
+
+    from notify import send
+
+    class BaseApi:
+        def notify(self, *args, **kwargs):
+            return send(*args, **kwargs)
+
+    QLAPI = BaseApi()
+    builtins.QLAPI = QLAPI
 except Exception as error:
     print(f"run builtin code error: {error}\n")

package/shell/rmlog.sh

@@ -2,34 +2,37 @@
 
 days=$1
 
-## 删除运行脚本的旧日志
 remove_js_log() {
-  local log_full_path_list=$(find $dir_log/ -name "*.log")
+  local log_full_path_list=$(find $dir_log -name "*.log")
   local diff_time
   for log in $log_full_path_list; do
-    local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10) #文件名比文件属性获得的日期要可靠
-    if [[ $(date +%s -d $log_date 2>/dev/null) ]]; then
+    local log_date=$(echo $log | awk -F "/" '{print $NF}' | cut -c1-10)
+    if ! [[ $log_date =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then
       if [[ $is_macos -eq 1 ]]; then
-        diff_time=$(($(date +%s) - $(date -j -f "%Y-%m-%d" "$log_date" +%s)))
+        log_date=$(stat -f %Sm -t "%Y-%m-%d" "$log")
       else
-        diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
+        log_date=$(stat -c %y "$log" | cut -d ' ' -f 1)
       fi
-      if [[ $diff_time -gt $((${days} * 86400)) ]]; then
-        local log_path=$(echo "$log" | sed "s,${dir_log}/,,g")
-        local result=$(find_cron_api "log_path=$log_path")
-        echo -e "查询文件 $log_path"
-        if [[ -z $result ]]; then
-          echo -e "删除中~"
-          rm -vf $log
-        else
-          echo -e "正在被 $result 使用，跳过~"
-        fi
+    fi
+    if [[ $is_macos -eq 1 ]]; then
+      diff_time=$(($(date +%s) - $(date -j -f "%Y-%m-%d" "$log_date" +%s)))
+    else
+      diff_time=$(($(date +%s) - $(date +%s -d "$log_date")))
+    fi
+    if [[ $diff_time -gt $((${days} * 86400)) ]]; then
+      local log_path=$(echo "$log" | sed "s,${dir_log}/,,g")
+      local result=$(find_cron_api "log_path=$log_path")
+      echo -e "查询文件 $log_path"
+      if [[ -z $result ]]; then
+        echo -e "删除中~"
+        rm -vf $log
+      else
+        echo -e "正在被 $result 使用，跳过~"
       fi
     fi
   done
 }
 
-## 删除空文件夹
 remove_empty_dir() {
   cd $dir_log
   for dir in $(ls); do
@@ -39,7 +42,6 @@ remove_empty_dir() {
   done
 }
 
-## 运行
 if [[ ${days} ]]; then
   echo -e "查找旧日志文件中...\n"
   remove_js_log

package/shell/share.sh

@@ -5,7 +5,7 @@ export dir_root=$QL_DIR
 export dir_tmp=$dir_root/.tmp
 export dir_data=$dir_root/data
 
-if [[ $QL_DATA_DIR ]]; then
+if [[ ${QL_DATA_DIR:=} ]]; then
   export dir_data="${QL_DATA_DIR%/}"
 fi
 
@@ -84,7 +84,7 @@ import_config() {
   command_timeout_time=${CommandTimeoutTime:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
   proxy_url=${ProxyUrl:-""}
-  current_branch=${QL_BRANCH}
+  current_branch=${QL_BRANCH:-""}
 
   if [[ -n "${DefaultCronRule}" ]]; then
     default_cron="${DefaultCronRule}"
@@ -461,7 +461,7 @@ run_task_before() {
 run_task_after() {
   . $file_task_after "$@"
 
-  if [[ $task_after ]]; then
+  if [[ ${task_after:=} ]]; then
     echo -e "\n执行后置命令\n"
     eval "$task_after" "$@"
     echo -e "\n执行后置命令结束"

package/shell/start.sh

@@ -67,10 +67,11 @@ cd ${QL_DIR}
 cp -f .env.example .env
 chmod 777 ${QL_DIR}/shell/*.sh
 
-. ${QL_DIR}/shell/env.sh
 . ${QL_DIR}/shell/share.sh
+. ${QL_DIR}/shell/env.sh
 
 echo -e "======================1. 检测配置文件========================\n"
+import_config "$@"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
 init_nginx

package/shell/task.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-## 导入通用变量与函数
 dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
@@ -11,7 +10,6 @@ single_hanle() {
   exit 1
 }
 
-## 选择python3还是node
 define_program() {
   local file_param=$1
   if [[ $file_param == *.js ]] || [[ $file_param == *.mjs ]]; then
@@ -34,7 +32,7 @@ handle_log_path() {
     file_param="task"
   fi
 
-  if [[ -z $ID ]]; then
+  if [[ -z ${ID:=} ]]; then
     ID=$(cat $list_crontab_user | grep -E "$cmd_task.* $file_param" | perl -pe "s|.*ID=(.*) $cmd_task.* $file_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
   fi
   local suffix=""
@@ -62,17 +60,17 @@ handle_log_path() {
   log_dir="${log_dir_tmp%.*}${suffix}"
   log_path="$log_dir/$log_time.log"
 
-  if [[ $real_log_path ]]; then
+  if [[ ${real_log_path:=} ]]; then
     log_path="$real_log_path"
   fi
 
   cmd="2>&1 | tee -a $dir_log/$log_path"
   make_dir "$dir_log/$log_dir"
-  if [[ "$no_tee" == "true" ]]; then
+  if [[ "${no_tee:=}" == "true" ]]; then
     cmd=">> $dir_log/$log_path 2>&1"
   fi
 
-  if [[ "$real_time" == "true" ]]; then
+  if [[ "${real_time:=}" == "true" ]]; then
     cmd=""
   fi
 }
@@ -124,8 +122,8 @@ while getopts ":lm:" opt; do
     ;;
   esac
 done
-[[ $show_log ]] && shift $(($OPTIND - 1))
-if [[ $max_time ]]; then
+[[ ${show_log:=} ]] && shift $(($OPTIND - 1))
+if [[ ${max_time:=} ]]; then
   shift $(($OPTIND - 1))
   command_timeout_time="$max_time"
 fi

package/static/build/api/subscription.js

@@ -15,7 +15,7 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const subscriptionService = typedi_1.Container.get(subscription_1.default);
-            const data = await subscriptionService.list(req.query.searchValue);
+            const data = await subscriptionService.list(req.query.searchValue, req.query.ids);
             return res.send({ code: 200, data });
         }
         catch (e) {
@@ -180,8 +180,8 @@ exports.default = (app) => {
         body: celebrate_1.Joi.array().items(celebrate_1.Joi.number().required()),
         query: celebrate_1.Joi.object({
             force: celebrate_1.Joi.boolean().optional(),
-            t: celebrate_1.Joi.number()
-        })
+            t: celebrate_1.Joi.number(),
+        }),
     }), async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {

package/static/build/api/system.js

@@ -296,10 +296,26 @@ exports.default = (app) => {
             return next(e);
         }
     });
-    route.get('/log', async (req, res, next) => {
+    route.get('/log', (0, celebrate_1.celebrate)({
+        query: {
+            startTime: celebrate_1.Joi.string().allow('').optional(),
+            endTime: celebrate_1.Joi.string().allow('').optional(),
+            t: celebrate_1.Joi.string().optional(),
+        },
+    }), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            await systemService.getSystemLog(res, req.query);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
+    route.delete('/log', async (req, res, next) => {
         try {
             const systemService = typedi_1.Container.get(system_1.default);
-            await systemService.getSystemLog(res);
+            await systemService.deleteSystemLog();
+            res.send({ code: 200 });
         }
         catch (e) {
             return next(e);

package/static/build/app.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+require("./loaders/sentry");
 require("reflect-metadata"); // We need this in order to use @Decorators
 const config_1 = __importDefault(require("./config"));
 const express_1 = __importDefault(require("express"));
@@ -11,7 +12,6 @@ async function startServer() {
     const app = (0, express_1.default)();
     await require('./loaders/db').default();
     await require('./loaders/initFile').default();
-    await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/app').default({ expressApp: app });
     const server = app
         .listen(config_1.default.port, '0.0.0.0', () => {

package/static/build/config/index.js

@@ -47,6 +47,7 @@ const extraFile = path_1.default.join(configPath, 'extra.sh');
 const confBakDir = path_1.default.join(dataPath, 'config/bak/');
 const sampleFile = path_1.default.join(samplePath, 'config.sample.sh');
 const sqliteFile = path_1.default.join(samplePath, 'database.sqlite');
+const systemNotifyFile = path_1.default.join(preloadPath, 'system-notify.json');
 const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
@@ -126,5 +127,6 @@ exports.default = {
     sqliteFile,
     sshdPath,
     systemLogPath,
+    systemNotifyFile,
 };
 //# sourceMappingURL=index.js.map

package/static/build/config/util.js

@@ -431,7 +431,7 @@ async function parseVersion(path) {
     return (0, js_yaml_1.load)(await fs.readFile(path, 'utf8'));
 }
 exports.parseVersion = parseVersion;
-async function parseContentVersion(content) {
+function parseContentVersion(content) {
     return (0, js_yaml_1.load)(content);
 }
 exports.parseContentVersion = parseContentVersion;

package/static/build/loaders/express.js

@@ -135,6 +135,7 @@ exports.default = ({ app }) => {
         next(err);
     });
     app.use((0, celebrate_1.errors)());
+    Sentry.setupExpressErrorHandler(app);
     app.use((err, req, res, next) => {
         if (err.name === 'UnauthorizedError') {
             return res
@@ -158,7 +159,6 @@ exports.default = ({ app }) => {
         return next(err);
     });
     app.use((err, req, res, next) => {
-        Sentry.captureException(err);
         res.status(err.status || 500);
         res.json({
             code: err.status || 500,