Optimize memory usage by fetching only required fields

Co-authored-by: whyour <22700758+whyour@users.noreply.github.com>

back/config/index.ts

@@ -64,19 +64,6 @@ if (!process.env.QL_DIR) {
 
 const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 
-// Get and normalize QlBaseUrl
-let baseUrl = process.env.QlBaseUrl || '';
-if (baseUrl) {
-  // Ensure it starts with /
-  if (!baseUrl.startsWith('/')) {
-    baseUrl = `/${baseUrl}`;
-  }
-  // Remove trailing slash for consistency in route definitions
-  if (baseUrl.endsWith('/')) {
-    baseUrl = baseUrl.slice(0, -1);
-  }
-}
-
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
@@ -129,7 +116,6 @@ if (envFound.error) {
 export default {
   ...config,
   jwt: config.jwt,
-  baseUrl,
   rootPath,
   tmpPath,
   dataPath,

back/config/util.ts

@@ -397,6 +397,21 @@ export function psTree(pid: number): Promise<number[]> {
   });
 }
 
+export function isPidRunning(pid: number): boolean {
+  // Validate PID: must be a positive integer
+  if (pid == null || pid <= 0 || !Number.isInteger(pid)) {
+    return false;
+  }
+  
+  try {
+    // Signal 0 doesn't kill the process, just checks if it exists
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
 export async function killTask(pid: number) {
   const pids = await psTree(pid);
 

back/loaders/express.ts

@@ -15,13 +15,6 @@ import path from 'path';
 export default ({ app }: { app: Application }) => {
   app.set('trust proxy', 'loopback');
   app.use(cors());
-  
-  // Rewrite URLs to strip baseUrl prefix if configured
-  // This allows the rest of the app to work without baseUrl awareness
-  if (config.baseUrl) {
-    app.use(rewrite(`${config.baseUrl}/*`, '/$1'));
-  }
-  
   app.get(`${config.api.prefix}/env.js`, serveEnv);
   app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));
 

back/loaders/initData.ts

@@ -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, safeJSONParse } from '../config/util';
+import { createRandomString, fileExist, safeJSONParse, isPidRunning } from '../config/util';
 import OpenService from '../services/open';
 import { shareStore } from '../shared/store';
 import Logger from './logger';
@@ -132,7 +132,32 @@ export default async () => {
   });
 
   // 初始化更新所有任务状态为空闲
-  await CrontabModel.update({ status: CrontabStatus.idle }, { where: {} });
+  // 但保留仍在运行的任务的状态
+  const allCrons = await CrontabModel.findAll({
+    attributes: ['id', 'pid'],
+    raw: true,
+  });
+  const idsToReset: number[] = [];
+  
+  for (const cron of allCrons) {
+    // 如果任务有 PID 且进程仍在运行，则保持其状态
+    if (cron.pid != null && isPidRunning(cron.pid)) {
+      // 保留当前状态（running 或 queued）
+      continue;
+    }
+    // 收集需要重置的任务 ID
+    if (cron.id) {
+      idsToReset.push(cron.id);
+    }
+  }
+  
+  // 批量更新所有需要重置的任务
+  if (idsToReset.length > 0) {
+    await CrontabModel.update(
+      { status: CrontabStatus.idle, pid: undefined },
+      { where: { id: { [Op.in]: idsToReset } } }
+    );
+  }
 
   // 初始化时执行一次所有的 ql repo 任务
   CrontabModel.findAll({