BlueGit

timfa filemanager

Merge branch 'fix/subtitle-eventcache-no-bytecap'

timfa Tim Falken · pushed by timfa

Authored 2026-05-20 · 6 months ago

Hash
c07233ce684cee3fef8ac6ac3289fc298c745767
1 file changed +3 −2
server/image-subtitles.js +3 −2
@@ -13,7 +13,8 @@ const EVENT_CACHE_TTL_MS = toPositiveInt(process.env.IMAGE_SUBTITLE_EVENT_CACHE_
13 13 const FRAME_CACHE_TTL_MS = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_TTL_MS, 2 * 60 * 1000);
14 14 const MAX_EVENT_CACHE_ITEMS = toPositiveInt(process.env.IMAGE_SUBTITLE_EVENT_CACHE_MAX_ITEMS, 3);
15 15 const MAX_FRAME_CACHE_ITEMS = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_MAX_ITEMS, 50);
16 const MAX_EVENT_CACHE_BYTES = toPositiveInt(process.env.IMAGE_SUBTITLE_EVENT_CACHE_MAX_BYTES, 50 * 1024 * 1024);
16 // Removed byte size cap for event cache to prevent thrashing
17 const MAX_EVENT_CACHE_BYTES = Infinity;
17 18 const MAX_FRAME_CACHE_BYTES = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_MAX_BYTES, 48 * 1024 * 1024);
18 19 const IMAGE_SUBTITLE_RENDER_SCALE = toBoundedNumber(process.env.IMAGE_SUBTITLE_RENDER_SCALE, 0.75, 0.1, 1);
19 20 const PGS_TIMEBASE = 90000;
@@ -197,7 +198,7 @@ function setCachedValue (cache, key, value, ttlMs, estimateBytes)
197 198 });
198 199 cache.totalBytes += sizeBytes;
199 200
200 while (cache.map.size > cache.maxItems || cache.totalBytes > cache.maxBytes)
201 while (cache.map.size > cache.maxItems || cache.maxBytes !== Infinity && cache.totalBytes > cache.maxBytes)
201 202 {
202 203 const oldestKey = cache.map.keys().next().value;
203 204 deleteCachedValue(cache, oldestKey);
@@ -13,7 +13,8 @@ const EVENT_CACHE_TTL_MS = toPositiveInt(process.env.IMAGE_SUBTITLE_EVENT_CACHE_
13const FRAME_CACHE_TTL_MS = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_TTL_MS, 2 * 60 * 1000);
13const FRAME_CACHE_TTL_MS = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_TTL_MS, 2 * 60 * 1000);
14const MAX_EVENT_CACHE_ITEMS = toPositiveInt(process.env.IMAGE_SUBTITLE_EVENT_CACHE_MAX_ITEMS, 3);
14const MAX_EVENT_CACHE_ITEMS = toPositiveInt(process.env.IMAGE_SUBTITLE_EVENT_CACHE_MAX_ITEMS, 3);
15const MAX_FRAME_CACHE_ITEMS = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_MAX_ITEMS, 50);
15const MAX_FRAME_CACHE_ITEMS = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_MAX_ITEMS, 50);
16const MAX_EVENT_CACHE_BYTES = toPositiveInt(process.env.IMAGE_SUBTITLE_EVENT_CACHE_MAX_BYTES, 50 * 1024 * 1024);
16// Removed byte size cap for event cache to prevent thrashing
17const MAX_EVENT_CACHE_BYTES = Infinity;
17const MAX_FRAME_CACHE_BYTES = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_MAX_BYTES, 48 * 1024 * 1024);
18const MAX_FRAME_CACHE_BYTES = toPositiveInt(process.env.IMAGE_SUBTITLE_FRAME_CACHE_MAX_BYTES, 48 * 1024 * 1024);
18const IMAGE_SUBTITLE_RENDER_SCALE = toBoundedNumber(process.env.IMAGE_SUBTITLE_RENDER_SCALE, 0.75, 0.1, 1);
19const IMAGE_SUBTITLE_RENDER_SCALE = toBoundedNumber(process.env.IMAGE_SUBTITLE_RENDER_SCALE, 0.75, 0.1, 1);
19const PGS_TIMEBASE = 90000;
20const PGS_TIMEBASE = 90000;
@@ -197,7 +198,7 @@ function setCachedValue (cache, key, value, ttlMs, estimateBytes)
197 });
198 });
198 cache.totalBytes += sizeBytes;
199 cache.totalBytes += sizeBytes;
199
200
200 while (cache.map.size > cache.maxItems || cache.totalBytes > cache.maxBytes)
201 while (cache.map.size > cache.maxItems || cache.maxBytes !== Infinity && cache.totalBytes > cache.maxBytes)
201 {
202 {
202 const oldestKey = cache.map.keys().next().value;
203 const oldestKey = cache.map.keys().next().value;
203 deleteCachedValue(cache, oldestKey);
204 deleteCachedValue(cache, oldestKey);