Address code review feedback

- Wrapped status updates in try-catch blocks to handle database errors - Moved CrontabModel import to top of pLimit.ts to avoid repeated dynamic imports Co-authored-by: whyour <22700758+whyour@users.noreply.github.com>
Fix scheduled task instance mode issues
2026-08-09 10:27:12 +08:00 · 2025-12-30 16:43:16 +00:00 · 2025-12-30 16:41:28 +00:00 · 2025-12-30 16:33:54 +00:00
14 changed files with 106 additions and 138 deletions
@@ -116,9 +116,6 @@ export class EmailNotification extends NotificationBaseInfo {
  public emailUser: string = '';
  public emailPass: string = '';
  public emailTo: string = '';
-  public emailHost: string = '';
-  public emailPort: string = '';
-  public emailSecure: string = '';
 }

 export class PushMeNotification extends NotificationBaseInfo {
@@ -13,29 +13,9 @@ import { isValidToken } from '../shared/auth';
 import path from 'path';

 export default ({ app }: { app: Application }) => {
-  // Security: Enable strict routing to prevent case-insensitive path bypass
-  app.set('case sensitive routing', true);
-  app.set('strict routing', true);
  app.set('trust proxy', 'loopback');
  app.use(cors());
  
-  // Security: Path normalization middleware to prevent case variation attacks
-  app.use((req, res, next) => {
-    const originalPath = req.path;
-    const normalizedPath = originalPath.toLowerCase();
-    
-    // Block requests with case variations on protected paths
-    if (originalPath !== normalizedPath && 
-        (normalizedPath.startsWith('/api/') || normalizedPath.startsWith('/open/'))) {
-      return res.status(400).json({
-        code: 400,
-        message: 'Invalid path format'
-      });
-    }
-    
-    next();
-  });
-  
  // Rewrite URLs to strip baseUrl prefix if configured
  // This allows the rest of the app to work without baseUrl awareness
  if (config.baseUrl) {
@@ -56,7 +36,7 @@ export default ({ app }: { app: Application }) => {
      secret: config.jwt.secret,
      algorithms: ['HS384'],
    }).unless({
-      path: [...config.apiWhiteList, /^(\/(?!api\/).*)$/i],
+      path: [...config.apiWhiteList, /^\/(?!api\/).*/],
    }),
  );

@@ -71,20 +51,19 @@ export default ({ app }: { app: Application }) => {
  });

  app.use(async (req: Request, res, next) => {
-    const pathLower = req.path.toLowerCase();
-    if (!['/open/', '/api/'].some((x) => pathLower.startsWith(x))) {
+    if (!['/open/', '/api/'].some((x) => req.path.startsWith(x))) {
      return next();
    }

    const headerToken = getToken(req);
-    if (pathLower.startsWith('/open/')) {
+    if (req.path.startsWith('/open/')) {
      const apps = await shareStore.getApps();
      const doc = apps?.filter((x) =>
        x.tokens?.find((y) => y.value === headerToken),
      )?.[0];
      if (doc && doc.tokens && doc.tokens.length > 0) {
        const currentToken = doc.tokens.find((x) => x.value === headerToken);
-        const keyMatch = pathLower.match(/\/open\/([a-z]+)\/*/);
+        const keyMatch = req.path.match(/\/open\/([a-z]+)\/*/);
        const key = keyMatch && keyMatch[1];
        if (
          doc.scopes.includes(key as any) &&
@@ -119,15 +98,7 @@ export default ({ app }: { app: Application }) => {
  });

  app.use(async (req, res, next) => {
-    const pathLower = req.path.toLowerCase();
-    if (
-      ![
-        '/api/user/init',
-        '/api/user/notification/init',
-        '/open/user/init',
-        '/open/user/notification/init',
-      ].includes(req.path)
-    ) {
+    if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
      return next();
    }
    const authInfo =
@@ -13,7 +13,7 @@ import { AuthDataType, SystemModel } from '../data/system';
 import SystemService from '../services/system';
 import UserService from '../services/user';
 import { writeFile, readFile } from 'fs/promises';
-import { createRandomString, fileExist, isDemoEnv, safeJSONParse } from '../config/util';
+import { createRandomString, fileExist, safeJSONParse } from '../config/util';
 import OpenService from '../services/open';
 import { shareStore } from '../shared/store';
 import Logger from './logger';
@@ -50,7 +50,7 @@ export default async () => {
  const [authConfig] = await SystemModel.findOrCreate({
    where: { type: AuthDataType.authConfig },
  });
-  if (!authConfig?.info || isDemoEnv()) {
+  if (!authConfig?.info) {
    let authInfo = {
      username: 'admin',
      password: 'admin',
@@ -590,46 +590,16 @@ export default class NotificationService {
  }

  private async email() {
-    const {
-      emailPass,
-      emailService,
-      emailUser,
-      emailTo,
-      emailHost,
-      emailPort,
-      emailSecure,
-    } = this.params;
+    const { emailPass, emailService, emailUser, emailTo } = this.params;

    try {
-      const transportConfig: {
-        service?: string;
-        host?: string;
-        port?: number;
-        secure?: boolean;
-        auth: { user: string; pass: string };
-      } = {
+      const transporter = nodemailer.createTransport({
+        service: emailService,
        auth: {
          user: emailUser,
          pass: emailPass,
        },
-      };
-
-      if (emailHost) {
-        transportConfig.host = emailHost;
-        const parsedPort = emailPort ? parseInt(emailPort, 10) : NaN;
-        transportConfig.port =
-          !isNaN(parsedPort) && parsedPort >= 1 && parsedPort <= 65535
-            ? parsedPort
-            : 465;
-        transportConfig.secure =
-          emailSecure !== undefined && emailSecure !== ''
-            ? emailSecure === 'true'
-            : transportConfig.port === 465;
-      } else {
-        transportConfig.service = emailService;
-      }
-
-      const transporter = nodemailer.createTransport(transportConfig);
+      });

      const info = await transporter.sendMail({
        from: `"青龙快讯" <${emailUser}>`,
@@ -14,6 +14,7 @@ import {
 import config from '../config';
 import { credentials } from '@grpc/grpc-js';
 import { ApiClient } from '../protos/api';
+import { CrontabModel } from '../data/cron';

 class TaskLimit {
  private dependenyLimit = new PQueue({ concurrency: 1 });
@@ -131,13 +132,38 @@ class TaskLimit {
    let runs = this.queuedCrons.get(cron.id);
    const result = runs?.length ? [...runs, fn] : [fn];
    const repeatTimes = this.repeatCronNotifyMap.get(cron.id) || 0;
-    if (result?.length > 5) {
+    
+    // Check instance mode from database to determine queue limit
+    let maxQueueSize = 10; // Default for multi-instance mode (increased from 5)
+    let isSingleInstanceMode = false;
+    try {
+      const cronRecord = await CrontabModel.findOne({
+        where: { id: Number(cron.id) },
+      });
+      
+      // Default to single instance mode (0) for backward compatibility
+      // allow_multiple_instances is 1 for multi-instance, 0 or null/undefined for single instance
+      isSingleInstanceMode = cronRecord?.allow_multiple_instances !== 1;
+      
+      if (isSingleInstanceMode) {
+        // For single instance mode, allow up to 2 queued tasks
+        // This allows the new task to be queued while the old one is being killed
+        maxQueueSize = 2;
+      }
+    } catch (error) {
+      Logger.error(
+        `[schedule][检查实例模式失败] 任务ID: ${cron.id}, 错误: ${error}`,
+      );
+    }
+    
+    if (result?.length > maxQueueSize) {
      if (repeatTimes < 3) {
        this.repeatCronNotifyMap.set(cron.id, repeatTimes + 1);
+        const modeStr = isSingleInstanceMode ? '单实例' : '多实例';
        this.client.systemNotify(
          {
            title: '任务重复运行',
-            content: `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`,
+            content: `任务：${cron.name}（${modeStr}模式），命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 ${maxQueueSize} 个，请检查定时设置`,
          },
          (err, res) => {
            if (err) {
@@ -15,11 +15,12 @@ export function runCron(cmd: string, cron: ICron): Promise<number | void> {
        });

        // Default to single instance mode (0) for backward compatibility
-        const allowSingleInstances =
-          existingCron?.allow_multiple_instances === 0;
+        // allow_multiple_instances is 1 for multi-instance, 0 or null/undefined for single instance
+        const isSingleInstanceMode =
+          existingCron?.allow_multiple_instances !== 1;

        if (
-          allowSingleInstances &&
+          isSingleInstanceMode &&
          existingCron &&
          existingCron.pid &&
          (existingCron.status === CrontabStatus.running ||
@@ -49,6 +50,18 @@ export function runCron(cmd: string, cron: ICron): Promise<number | void> {
      );
      const cp = spawn(cmd, { shell: '/bin/bash' });

+      // Update status to running after spawning the process
+      try {
+        await CrontabModel.update(
+          { status: CrontabStatus.running, pid: cp.pid },
+          { where: { id: Number(cron.id) } },
+        );
+      } catch (error) {
+        Logger.error(
+          `[schedule][更新任务状态失败] 任务ID: ${cron.id}, 错误: ${error}`,
+        );
+      }
+
      cp.stderr.on('data', (data) => {
        Logger.info(
          '[schedule][执行任务失败] 命令: %s, 错误信息: %j',
@@ -66,6 +79,17 @@ export function runCron(cmd: string, cron: ICron): Promise<number | void> {

      cp.on('exit', async (code) => {
        taskLimit.removeQueuedCron(cron.id);
+        // Update status to idle after task completes
+        try {
+          await CrontabModel.update(
+            { status: CrontabStatus.idle, pid: undefined },
+            { where: { id: Number(cron.id) } },
+          );
+        } catch (error) {
+          Logger.error(
+            `[schedule][更新任务状态失败] 任务ID: ${cron.id}, 错误: ${error}`,
+          );
+        }
        Logger.info(
          '[schedule][执行任务结束] 参数: %s, 退出码: %j',
          JSON.stringify({
@@ -69,10 +69,9 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \

 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
  PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
-  HOME=/root
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3

-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
@@ -69,10 +69,9 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \

 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
  PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
-  HOME=/root
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3

-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
@@ -1,5 +1,7 @@
 #!/bin/bash

+export PATH="$HOME/bin:$PATH"
+
 dir_shell=/ql/shell
 . $dir_shell/share.sh

@@ -55,15 +55,12 @@
    }
  },
  "dependencies": {
-    "@bufbuild/protobuf": "^2.10.0",
    "@grpc/grpc-js": "^1.14.0",
    "@grpc/proto-loader": "^0.8.0",
-    "@keyv/sqlite": "^4.0.1",
    "@otplib/preset-default": "^12.0.1",
    "body-parser": "^1.20.3",
    "celebrate": "^15.0.3",
    "chokidar": "^4.0.1",
-    "compression": "^1.7.4",
    "cors": "^2.8.5",
    "cron-parser": "^5.4.0",
    "cross-spawn": "^7.0.6",
@@ -73,66 +70,69 @@
    "express-jwt": "^8.4.1",
    "express-rate-limit": "^7.4.1",
    "express-urlrewrite": "^2.0.3",
-    "helmet": "^8.1.0",
+    "undici": "^7.9.0",
    "hpagent": "^1.2.0",
    "http-proxy-middleware": "^3.0.3",
    "iconv-lite": "^0.6.3",
-    "ip2region": "2.3.0",
    "js-yaml": "^4.1.0",
    "jsonwebtoken": "^9.0.2",
-    "keyv": "^5.2.3",
    "lodash": "^4.17.21",
-    "multer": "^2.1.1",
+    "multer": "1.4.5-lts.1",
    "node-schedule": "^2.1.0",
    "nodemailer": "^6.9.16",
    "p-queue-cjs": "7.3.4",
-    "proper-lockfile": "^4.1.2",
+    "@bufbuild/protobuf": "^2.10.0",
    "ps-tree": "^1.2.0",
    "reflect-metadata": "^0.2.2",
-    "request-ip": "3.3.0",
    "sequelize": "^6.37.5",
    "sockjs": "^0.3.24",
    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
    "toad-scheduler": "^3.0.1",
    "typedi": "^0.10.0",
-    "undici": "^7.9.0",
    "uuid": "^11.0.3",
    "winston": "^3.17.0",
-    "winston-daily-rotate-file": "^5.0.0"
+    "winston-daily-rotate-file": "^5.0.0",
+    "request-ip": "3.3.0",
+    "ip2region": "2.3.0",
+    "keyv": "^5.2.3",
+    "@keyv/sqlite": "^4.0.1",
+    "proper-lockfile": "^4.1.2",
+    "compression": "^1.7.4",
+    "helmet": "^8.1.0"
  },
  "devDependencies": {
+    "moment": "2.30.1",
    "@ant-design/icons": "^5.0.1",
    "@ant-design/pro-layout": "6.38.22",
-    "@codemirror/state": "^6.4.1",
    "@codemirror/view": "^6.34.1",
+    "@codemirror/state": "^6.4.1",
    "@monaco-editor/react": "4.2.1",
    "@react-hook/resize-observer": "^2.0.2",
+    "react-router-dom": "6.26.1",
    "@types/body-parser": "^1.19.2",
-    "@types/compression": "^1.7.2",
    "@types/cors": "^2.8.12",
    "@types/cross-spawn": "^6.0.2",
    "@types/express": "^4.17.13",
    "@types/express-jwt": "^6.0.4",
    "@types/file-saver": "2.0.2",
-    "@types/helmet": "^4.0.0",
    "@types/js-yaml": "^4.0.5",
    "@types/jsonwebtoken": "^8.5.8",
    "@types/lodash": "^4.14.185",
-    "@types/multer": "^2.1.0",
+    "@types/multer": "^1.4.7",
    "@types/node": "^17.0.21",
    "@types/node-schedule": "^1.3.2",
    "@types/nodemailer": "^6.4.4",
-    "@types/proper-lockfile": "^4.1.4",
-    "@types/ps-tree": "^1.1.6",
    "@types/qrcode.react": "^1.0.2",
    "@types/react": "^18.0.20",
    "@types/react-copy-to-clipboard": "^5.0.4",
    "@types/react-dom": "^18.0.6",
-    "@types/request-ip": "0.0.41",
    "@types/serve-handler": "^6.1.1",
    "@types/sockjs": "^0.3.33",
    "@types/sockjs-client": "^1.5.1",
    "@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",
@@ -144,9 +144,9 @@
    "axios": "^1.4.0",
    "compression-webpack-plugin": "9.2.0",
    "concurrently": "^7.0.0",
+    "react-hotkeys-hook": "^4.6.1",
    "file-saver": "2.0.2",
    "lint-staged": "^13.0.3",
-    "moment": "2.30.1",
    "monaco-editor": "0.33.0",
    "nodemon": "^3.0.1",
    "prettier": "^2.5.1",
@@ -162,9 +162,7 @@
    "react-dnd": "^16.0.1",
    "react-dnd-html5-backend": "^16.0.1",
    "react-dom": "18.3.1",
-    "react-hotkeys-hook": "^4.6.1",
    "react-intl-universal": "^2.12.0",
-    "react-router-dom": "6.26.1",
    "react-split-pane": "^0.1.92",
    "sockjs-client": "^1.6.0",
    "ts-node": "^10.9.2",
@@ -172,6 +170,8 @@
    "tslib": "^2.4.0",
    "typescript": "5.2.2",
    "vh-check": "^2.0.5",
-    "virtualizedtableforantd4": "1.3.0"
+    "virtualizedtableforantd4": "1.3.0",
+    "@types/compression": "^1.7.2",
+    "@types/helmet": "^4.0.0"
  }
 }
@@ -390,11 +390,7 @@
  "调用版本；专业版填写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",
  "飞书群组机器人加签密钥，安全设置中开启签名校验后获得": "Feishu group bot signature secret, obtained after enabling signature verification in security settings",
-  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json，设置emailHost后此项可不填": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json. Can be left blank if emailHost is set",
  "邮箱服务名称，比如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",
-  "自定义SMTP服务器地址，设置后将忽略emailService中的服务器配置，如smtp.qiye.aliyun.com": "Custom SMTP server address. When set, the server configuration in emailService will be ignored. E.g., smtp.qiye.aliyun.com",
-  "自定义SMTP端口号，默认465": "Custom SMTP port number, default is 465",
-  "是否使用SSL/TLS，端口为465时默认为true，否则默认为false": "Whether to use SSL/TLS. Defaults to true when port is 465, otherwise false",
  "邮箱地址": "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/",
@@ -390,11 +390,7 @@
  "调用版本；专业版填写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，设置emailHost后此项可不填": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json，设置emailHost后此项可不填",
  "邮箱服务名称，比如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服务器地址，设置后将忽略emailService中的服务器配置，如smtp.qiye.aliyun.com": "自定义SMTP服务器地址，设置后将忽略emailService中的服务器配置，如smtp.qiye.aliyun.com",
-  "自定义SMTP端口号，默认465": "自定义SMTP端口号，默认465",
-  "是否使用SSL/TLS，端口为465时默认为true，否则默认为false": "是否使用SSL/TLS，端口为465时默认为true，否则默认为false",
  "邮箱地址": "邮箱地址",
  "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",
  "PushMe的Key，https://push.i-i.me/": "PushMe的Key，https://push.i-i.me/",
@@ -406,26 +406,9 @@ export default {
      {
        label: 'emailService',
        tip: intl.get(
-          '邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json，设置emailHost后此项可不填',
+          '邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json',
        ),
-      },
-      {
-        label: 'emailHost',
-        tip: intl.get(
-          '自定义SMTP服务器地址，设置后将忽略emailService中的服务器配置，如smtp.qiye.aliyun.com',
-        ),
-      },
-      {
-        label: 'emailPort',
-        tip: intl.get('自定义SMTP端口号，默认465'),
-      },
-      {
-        label: 'emailSecure',
-        tip: intl.get('是否使用SSL/TLS，端口为465时默认为true，否则默认为false'),
-        items: [
-          { value: 'true', label: 'true' },
-          { value: 'false', label: 'false' },
-        ],
+        required: true,
      },
      { label: 'emailUser', tip: intl.get('邮箱认证地址'), required: true },
      {
@@ -1,6 +1,11 @@
-version: 2.20.2
-changeLogLink: https://t.me/jiao_long/434
-publishTime: 2026-03-01 1800
+version: 2.20.1
+changeLogLink: https://t.me/jiao_long/433
+publishTime: 2025-12-26 22:00
 changeLog: |
-  1. 修复 path 安全漏洞（重要）
-  
+  1. 修复获取依赖管理列表
+  2. notify.js 修复 TG_PROXY_AUTH 参数拼接
+  3. QLAPI.notify larkSecret 参数
+  4. 修复 cron parser 定时规则校验
+  5. 修复设置 baseUrl 后无法访问
+  6. 修复环境变量排序
+  7. 修复定时任务无法停止