@whyour/qinglong 2.18.3-3 → 2.19.0-0

package/.env.example

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

package/docker/310.Dockerfile

@@ -19,14 +19,13 @@ LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
 
-ENV PNPM_HOME=/root/.local/share/pnpm \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
-  NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
+ENV QL_DIR=/ql \
+  QL_BRANCH=${QL_BRANCH} \
   LANG=C.UTF-8 \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ " \
-  QL_DIR=/ql \
-  QL_BRANCH=${QL_BRANCH}
+  PYTHONPATH= \
+  PYTHON_SHORT_VERSION=
 
 COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
 COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@@ -55,12 +54,11 @@ RUN set -x && \
   git config --global user.name "qinglong" && \
   git config --global http.postBuffer 524288000 && \
   npm install -g pnpm@8.3.1 pm2 ts-node && \
-  rm -rf /root/.pnpm-store && \
-  rm -rf /root/.local/share/pnpm/store && \
   rm -rf /root/.cache && \
   rm -rf /root/.npm && \
+  rm -rf /etc/apt/apt.conf.d/docker-clean && \
   ulimit -c 0 && \
-  pip3 install requests
+  PYTHON_SHORT_VERSION=$(echo ${PYTHON_VERSION} | cut -d. -f1,2)
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
@@ -73,12 +71,23 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
   cp -rf /static/* ${QL_DIR}/static && \
   rm -rf /static
 
+ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
+  PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
+
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME} \
+  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
+  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
+  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}
+
+RUN pip3 install --prefix ${PYTHON_HOME} requests
+
 COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5600/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
 

package/docker/Dockerfile

@@ -19,14 +19,13 @@ LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
 
-ENV PNPM_HOME=/root/.local/share/pnpm \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
-  NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules \
+ENV QL_DIR=/ql \
+  QL_BRANCH=${QL_BRANCH} \
   LANG=C.UTF-8 \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ " \
-  QL_DIR=/ql \
-  QL_BRANCH=${QL_BRANCH}
+  PYTHONPATH= \
+  PYTHON_SHORT_VERSION=
 
 COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
 COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@@ -56,12 +55,11 @@ RUN set -x && \
   git config --global user.name "qinglong" && \
   git config --global http.postBuffer 524288000 && \
   npm install -g pnpm@8.3.1 pm2 ts-node && \
-  rm -rf /root/.pnpm-store && \
-  rm -rf /root/.local/share/pnpm/store && \
   rm -rf /root/.cache && \
   rm -rf /root/.npm && \
+  rm -rf /etc/apt/apt.conf.d/docker-clean && \
   ulimit -c 0 && \
-  pip3 install requests
+  PYTHON_SHORT_VERSION=$(echo ${PYTHON_VERSION} | cut -d. -f1,2)
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
@@ -74,12 +72,23 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
   cp -rf /static/* ${QL_DIR}/static && \
   rm -rf /static
 
+ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
+  PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
+
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME} \
+  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
+  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
+  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}
+
+RUN pip3 install --prefix ${PYTHON_HOME} requests
+
 COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5600/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
 

package/docker/docker-entrypoint.sh

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

package/docker/front.conf

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

package/ecosystem.config.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.18.3-3",
+  "version": "2.19.0-0",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -13,17 +13,11 @@
   },
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
-    "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",
+    "build:back": "tsc -p back/tsconfig.json",
     "panel": "npm run build:back && node static/build/app.js",
-    "schedule": "npm run build:back && node static/build/schedule/index.js",
-    "public": "npm run build:back && node static/build/public.js",
-    "update": "npm run build:back && node static/build/update.js",
     "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true,snakeToCamel=false",
     "gen:api": "python3 -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. ./back/protos/api.proto",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
@@ -105,7 +99,7 @@
     "nodemailer": "^6.9.16",
     "p-queue-cjs": "7.3.4",
     "@bufbuild/protobuf": "^2.2.3",
-    "pstree.remy": "^1.1.8",
+    "ps-tree": "^1.2.0",
     "reflect-metadata": "^0.2.2",
     "sequelize": "^6.37.5",
     "serve-handler": "^6.1.6",
@@ -120,7 +114,9 @@
     "ip2region": "2.3.0",
     "keyv": "^5.2.3",
     "@keyv/sqlite": "^4.0.1",
-    "proper-lockfile": "^4.1.2"
+    "proper-lockfile": "^4.1.2",
+    "compression": "^1.7.4",
+    "helmet": "^6.0.1"
   },
   "devDependencies": {
     "moment": "2.30.1",
@@ -154,6 +150,7 @@
     "@types/uuid": "^8.3.4",
     "@types/request-ip": "0.0.41",
     "@types/proper-lockfile": "^4.1.4",
+    "@types/ps-tree": "^1.1.6",
     "@uiw/codemirror-extensions-langs": "^4.21.9",
     "@uiw/react-codemirror": "^4.21.9",
     "@umijs/max": "^4.4.4",
@@ -192,6 +189,7 @@
     "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
-    "yorkie": "^2.0.0"
+    "@types/compression": "^1.7.2",
+    "@types/helmet": "^4.0.0"
   }
 }

package/sample/notify.js

@@ -84,7 +84,8 @@ const push_config = {
   AIBOTK_NAME: '', // 智能微秘书  发送群名 或者好友昵称和type要对应好
 
   SMTP_SERVICE: '', // 邮箱服务名称，比如 126、163、Gmail、QQ 等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
-  SMTP_EMAIL: '', // SMTP 收发件邮箱，通知将会由自己发给自己
+  SMTP_EMAIL: '', // SMTP 发件邮箱
+  SMTP_TO: '', // SMTP 收件邮箱，默认通知将会发给发件邮箱
   SMTP_PASSWORD: '', // SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
   SMTP_NAME: '', // SMTP 收发件人姓名，可随意填写
 
@@ -993,7 +994,8 @@ function fsBotNotify(text, desp) {
 }
 
 async function smtpNotify(text, desp) {
-  const { SMTP_EMAIL, SMTP_PASSWORD, SMTP_SERVICE, SMTP_NAME } = push_config;
+  const { SMTP_EMAIL, SMTP_TO, SMTP_PASSWORD, SMTP_SERVICE, SMTP_NAME } =
+    push_config;
   if (![SMTP_EMAIL, SMTP_PASSWORD].every(Boolean) || !SMTP_SERVICE) {
     return;
   }
@@ -1011,7 +1013,7 @@ async function smtpNotify(text, desp) {
     const addr = SMTP_NAME ? `"${SMTP_NAME}" <${SMTP_EMAIL}>` : SMTP_EMAIL;
     const info = await transporter.sendMail({
       from: addr,
-      to: addr,
+      to: SMTP_TO ? SMTP_TO.split(';') : addr,
       subject: text,
       html: `${desp.replace(/\n/g, '<br/>')}`,
     });

package/shell/check.sh

@@ -74,14 +74,12 @@ check_pm2() {
 main() {
   echo -e "=====> 开始检测"
   npm i -g pnpm@8.3.1 pm2 ts-node
-  patch_version
 
   reset_env
   copy_dep
   check_ql
   check_nginx
   check_pm2
-  reload_update
   reload_pm2
   echo -e "\n=====> 检测结束\n"
 }

package/shell/preload/sitecustomize.js

@@ -38,25 +38,48 @@ function run() {
 
     const splitStr = '__sitecustomize__';
     const fileName = process.argv[1].replace(`${dir_scripts}/`, '');
-    let command = `bash -c "source ${file_task_before} ${fileName}`;
+    const tempFile = `/tmp/env_${process.pid}.json`;
+
+    const commands = [
+      `source ${file_task_before} ${fileName}`,
+      task_before ? `eval '${task_before.replace(/'/g, "'\\''")}'` : null,
+      `echo -e '${splitStr}'`,
+      `node -e "require('fs').writeFileSync('${tempFile}', JSON.stringify(process.env))"`,
+    ].filter(Boolean);
+
     if (task_before) {
-      const escapeTaskBefore = task_before
-        .replace(/"/g, '\\"')
-        .replace(/\$/g, '\\$');
-      command = `${command} && eval '${escapeTaskBefore}'`;
       console.log('执行前置命令\n');
     }
-    const res = execSync(
-      `${command} && echo -e '${splitStr}' && node -p 'JSON.stringify(process.env)'"`,
-      {
-        encoding: 'utf-8',
-      },
-    );
-    const [output, envStr] = res.split(splitStr);
-    const newEnvObject = JSON.parse(envStr.trim());
-    for (const key in newEnvObject) {
-      process.env[key] = newEnvObject[key];
+
+    const res = execSync(commands.join(' && '), {
+      encoding: 'utf-8',
+      maxBuffer: 50 * 1024 * 1024,
+      shell: '/bin/bash',
+    });
+
+    const [output] = res.split(splitStr);
+
+    try {
+      const envStr = require('fs').readFileSync(tempFile, 'utf-8');
+      const newEnvObject = JSON.parse(envStr);
+      if (typeof newEnvObject === 'object' && newEnvObject !== null) {
+        for (const key in newEnvObject) {
+          if (Object.prototype.hasOwnProperty.call(newEnvObject, key)) {
+            process.env[key] = newEnvObject[key];
+          }
+        }
+      }
+      require('fs').unlinkSync(tempFile);
+    } catch (jsonError) {
+      console.log(
+        '\ue926 Failed to parse environment variables:',
+        jsonError.message,
+      );
+      try {
+        require('fs').unlinkSync(tempFile);
+      } catch (e) {}
     }
+
     if (output) {
       console.log(output);
     }

package/shell/preload/sitecustomize.py

@@ -43,35 +43,57 @@ def run():
 
         split_str = "__sitecustomize__"
         file_name = sys.argv[0].replace(f"{os.getenv('dir_scripts')}/", "")
-        command = f'bash -c "source {os.getenv("file_task_before")} {file_name}'
+        
+        # 创建临时文件路径
+        temp_file = f"/tmp/env_{os.getpid()}.json"
+        
+        # 构建命令数组
+        commands = [
+            f'source {os.getenv("file_task_before")} {file_name}'
+        ]
+        
         task_before = os.getenv("task_before")
-
         if task_before:
-            escape_task_before = task_before.replace('"', '\\"').replace("$", "\\$")
-            command += f" && eval '{escape_task_before}'"
+            escaped_task_before = task_before.replace("'", "'\\''")
+            commands.append(f"eval '{escaped_task_before}'")
             print("执行前置命令\n")
-
-        prev_pythonpath = os.getenv("PREV_PYTHONPATH", "")
-        python_command = (
-            "python3 -c 'import os, json; print(json.dumps(dict(os.environ)))'"
-        )
-        command += f" && echo -e '{split_str}' && {python_command}\""
+            
+        commands.append(f"echo -e '{split_str}'")
+        
+        # 修改 Python 命令，使用单行并正确处理引号
+        python_cmd = f"python3 -c 'import os,json; f=open(\\\"{temp_file}\\\",\\\"w\\\"); json.dump(dict(os.environ),f); f.close()'"
+        commands.append(python_cmd)
+        
+        command = " && ".join(cmd for cmd in commands if cmd)
+        command = f'bash -c "{command}"'
 
         res = subprocess.check_output(command, shell=True, encoding="utf-8")
-        output, env_str = res.split(split_str)
+        output = res.split(split_str)[0]
 
-        env_json = json.loads(env_str.strip())
+        try:
+            with open(temp_file, 'r') as f:
+                env_json = json.loads(f.read())
 
-        for key, value in env_json.items():
-            os.environ[key] = value
+            for key, value in env_json.items():
+                os.environ[key] = value
+
+            os.unlink(temp_file)
+        except Exception as json_error:
+            print(f"\ue926 Failed to parse environment variables: {json_error}")
+            try:
+                os.unlink(temp_file)
+            except:
+                pass
 
         if len(output) > 0:
             print(output)
         if task_before:
-            print("执行前置命令结束")
+            print("执行前置命令结束\n")
 
     except subprocess.CalledProcessError as error:
-        print(f"run task before error: {error}")
+        print(f"\ue926 run task before error: {error}")
+        if task_before:
+            print("执行前置命令结束\n")
     except OSError as error:
         error_message = str(error)
         if "Argument list too long" not in error_message:
@@ -81,9 +103,11 @@ def run():
                 "\ue926 The environment variable is too large. It is recommended to use task_before.py instead of task_before.sh\n"
             )
         if task_before:
-            print("执行前置命令结束")
+            print("执行前置命令结束\n")
     except Exception as error:
-        print(f"run task before error: {error}")
+        print(f"\ue926 run task before error: {error}")
+        if task_before:
+            print("执行前置命令结束\n")
 
     import task_before