From 6b7142a6d5aac0afed8776a0f6b3a89438845961 Mon Sep 17 00:00:00 2001
From: alikia2x <alikia2x@outlook.com>
Date: Mon, 24 Mar 2025 23:43:54 +0800
Subject: [PATCH] fix: new jobs may be scheduled before the current time

---
 lib/db/snapshotSchedule.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/db/snapshotSchedule.ts b/lib/db/snapshotSchedule.ts
index 4e6e244..90e5b07 100644
--- a/lib/db/snapshotSchedule.ts
+++ b/lib/db/snapshotSchedule.ts
@@ -179,29 +179,31 @@ export async function adjustSnapshotTime(
 ): Promise<Date> {
 	const currentWindow = getCurrentWindowIndex();
 
-	// 计算目标窗口偏移量
 	const targetOffset = Math.floor((expectedStartTime.getTime() - Date.now()) / (5 * MINUTE));
 
-	// 在 Redis 中查找可用窗口
 	for (let i = 0; i < WINDOW_SIZE; i++) {
 		const offset = (currentWindow + targetOffset + i) % WINDOW_SIZE;
 		const count = await getWindowCount(redisClient, offset);
 
 		if (count < allowedCounts) {
-			// 找到可用窗口，更新计数
 			await updateWindowCount(redisClient, offset, 1);
 
-			// 计算具体时间
 			const startPoint = new Date();
 			startPoint.setHours(0, 0, 0, 0);
 			const startTime = startPoint.getTime();
 			const windowStart = startTime + offset * 5 * MINUTE;
 			const randomDelay = Math.floor(Math.random() * 5 * MINUTE);
-			return new Date(windowStart + randomDelay);
+			const delayedDate = new Date(windowStart + randomDelay);
+			const now = new Date();
+
+			if (delayedDate.getTime() < now.getTime()) {
+				return now;
+			}
+
+			return delayedDate;
 		}
 	}
 
-	// 如果没有找到可用窗口，返回原始时间
 	return expectedStartTime;
 }