alikia2x/cvsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: remove lastAvailableWindow

Browse Source
This commit is contained in:
alikia2x (寒寒) 2025-03-27 03:26:13 +08:00
parent de061eeb0f
commit 7ad4255fa7
Signed by: alikia2x
GPG Key ID: 56209E0CCD8420C6
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/db/snapshotSchedule.ts
View File

@ -9,8 +9,6 @@ import { Redis } from "ioredis";
const WINDOW_SIZE = 2880; const WINDOW_SIZE = 2880;
const REDIS_KEY = "cvsa:snapshot_window_counts"; const REDIS_KEY = "cvsa:snapshot_window_counts";
let lastAvailableWindow: { offset: number; count: number } | null = null;
function getCurrentWindowIndex(): number { function getCurrentWindowIndex(): number {
const now = new Date(); const now = new Date();
const minutesSinceMidnight = now.getHours() * 60 + now.getMinutes(); const minutesSinceMidnight = now.getHours() * 60 + now.getMinutes();
@ -44,8 +42,6 @@ export async function refreshSnapshotWindowCounts(client: Client, redisClient: R
await redisClient.hset(REDIS_KEY, offset.toString(), Number(row.count)); await redisClient.hset(REDIS_KEY, offset.toString(), Number(row.count));
} }
} }
lastAvailableWindow = null;
} }
export async function initSnapshotWindowCounts(client: Client, redisClient: Redis) { export async function initSnapshotWindowCounts(client: Client, redisClient: Redis) {
@ -218,11 +214,7 @@ export async function adjustSnapshotTime(
const currentWindow = getCurrentWindowIndex(); const currentWindow = getCurrentWindowIndex();
const targetOffset = Math.floor((expectedStartTime.getTime() - Date.now()) / (5 * MINUTE)) - 6; const targetOffset = Math.floor((expectedStartTime.getTime() - Date.now()) / (5 * MINUTE)) - 6;
let initialOffset = currentWindow + Math.max(targetOffset, 0); const initialOffset = currentWindow + Math.max(targetOffset, 0);
if (lastAvailableWindow && lastAvailableWindow.count < allowedCounts) {
initialOffset = Math.max(lastAvailableWindow.offset - 2, 0);
}
let timePerIteration = 0; let timePerIteration = 0;
const t = performance.now(); const t = performance.now();
@ -231,8 +223,7 @@ export async function adjustSnapshotTime(
const count = await getWindowCount(redisClient, offset); const count = await getWindowCount(redisClient, offset);
if (count < allowedCounts) { if (count < allowedCounts) {
const newCount = await redisClient.hincrby(REDIS_KEY, offset.toString(), 1); await redisClient.hincrby(REDIS_KEY, offset.toString(), 1);
lastAvailableWindow = { offset, count: newCount };
const startPoint = new Date(); const startPoint = new Date();
startPoint.setHours(0, 0, 0, 0); startPoint.setHours(0, 0, 0, 0);