Skip to content

Add TTL-based cleanup for StreamInfos (30min, pruned every 5min) #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanbr merged 1 commit into from
Apr 7, 2026
+42 −0
Merged

Add TTL-based cleanup for StreamInfos (30min, pruned every 5min) #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions vaft/vaft-ublock-origin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,21 @@ twitch-videoad.js text/javascript
scope.IsAdStrippingEnabled = true;
scope.AdSegmentCache = new Map();
scope.AllSegmentsAreAdSegments = false;
scope.StreamInfoMaxAgeMs = 30 * 60 * 1000;
}
function pruneStreamInfos() {
const now = Date.now();
for (const channelName in StreamInfos) {
const streamInfo = StreamInfos[channelName];
if (!streamInfo || !streamInfo.LastSeenAt || (now - streamInfo.LastSeenAt) > StreamInfoMaxAgeMs) {
if (streamInfo && streamInfo.Urls) {
for (const url in streamInfo.Urls) {
delete StreamInfosByUrl[url];
}
}
delete StreamInfos[channelName];
}
}
}
let isActivelyStrippingAds = false;
let localStorageHookFailed = false;
Expand Down Expand Up @@ -152,6 +167,9 @@ twitch-videoad.js text/javascript
${replaceServerTimeInM3u8.toString()}
const workerString = getWasmWorkerJs('${twitchBlobUrl.replaceAll("'", "%27")}');
declareOptions(self);
if (!self.__tasPruneInterval) {
self.__tasPruneInterval = setInterval(pruneStreamInfos, 5 * 60 * 1000);
}
ReloadPlayerAfterAd = ${ReloadPlayerAfterAd};
ReloadCooldownSeconds = ${ReloadCooldownSeconds};
DisableReloadCap = ${DisableReloadCap};
Expand Down Expand Up @@ -310,6 +328,7 @@ twitch-videoad.js text/javascript
console.log('[AD DEBUG] New stream session — channel: ' + channelName + ', API: ' + (V2API ? 'v2' : 'v1'));
StreamInfos[channelName] = streamInfo = {
ChannelName: channelName,
LastSeenAt: Date.now(),
IsShowingAd: false,
LastPlayerReload: 0,
EncodingsM3U8: encodingsM3u8,
Expand Down Expand Up @@ -382,6 +401,7 @@ twitch-videoad.js text/javascript
}
}
}
streamInfo.LastSeenAt = Date.now();
streamInfo.LastPlayerReload = Date.now();
resolve(new Response(replaceServerTimeInM3u8(streamInfo.IsUsingModifiedM3U8 ? streamInfo.ModifiedM3U8 : streamInfo.EncodingsM3U8, serverTime)));
} else {
Expand Down Expand Up @@ -553,6 +573,7 @@ twitch-videoad.js text/javascript
if (!streamInfo) {
return textStr;
}
streamInfo.LastSeenAt = Date.now();
if (HasTriggeredPlayerReload) {
HasTriggeredPlayerReload = false;
streamInfo.LastPlayerReload = Date.now();
Expand Down
21 changes: 21 additions & 0 deletions vaft/vaft.user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@
scope.IsAdStrippingEnabled = true;
scope.AdSegmentCache = new Map();
scope.AllSegmentsAreAdSegments = false;
scope.StreamInfoMaxAgeMs = 30 * 60 * 1000;
}
function pruneStreamInfos() {
const now = Date.now();
for (const channelName in StreamInfos) {
const streamInfo = StreamInfos[channelName];
if (!streamInfo || !streamInfo.LastSeenAt || (now - streamInfo.LastSeenAt) > StreamInfoMaxAgeMs) {
if (streamInfo && streamInfo.Urls) {
for (const url in streamInfo.Urls) {
delete StreamInfosByUrl[url];
}
}
delete StreamInfos[channelName];
}
}
}
let isActivelyStrippingAds = false;
let localStorageHookFailed = false;
Expand Down Expand Up @@ -163,6 +178,9 @@
${replaceServerTimeInM3u8.toString()}
const workerString = getWasmWorkerJs('${twitchBlobUrl.replaceAll("'", "%27")}');
declareOptions(self);
if (!self.__tasPruneInterval) {
self.__tasPruneInterval = setInterval(pruneStreamInfos, 5 * 60 * 1000);
}
ReloadPlayerAfterAd = ${ReloadPlayerAfterAd};
ReloadCooldownSeconds = ${ReloadCooldownSeconds};
DisableReloadCap = ${DisableReloadCap};
Expand Down Expand Up @@ -321,6 +339,7 @@
console.log('[AD DEBUG] New stream session — channel: ' + channelName + ', API: ' + (V2API ? 'v2' : 'v1'));
StreamInfos[channelName] = streamInfo = {
ChannelName: channelName,
LastSeenAt: Date.now(),
IsShowingAd: false,
LastPlayerReload: 0,
EncodingsM3U8: encodingsM3u8,
Expand Down Expand Up @@ -393,6 +412,7 @@
}
}
}
streamInfo.LastSeenAt = Date.now();
streamInfo.LastPlayerReload = Date.now();
resolve(new Response(replaceServerTimeInM3u8(streamInfo.IsUsingModifiedM3U8 ? streamInfo.ModifiedM3U8 : streamInfo.EncodingsM3U8, serverTime)));
} else {
Expand Down Expand Up @@ -564,6 +584,7 @@
if (!streamInfo) {
return textStr;
}
streamInfo.LastSeenAt = Date.now();
if (HasTriggeredPlayerReload) {
HasTriggeredPlayerReload = false;
streamInfo.LastPlayerReload = Date.now();
Expand Down
Loading