Mirrors/TwitchAdSolutions
1
0
Fork 0
mirror of https://github.com/pixeltris/TwitchAdSolutions.git synced 2025-04-29 22:24:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reduce number of web requests

Browse Source
This commit is contained in:
pixeltris 2021-06-12 15:22:18 +01:00
parent 9ce9071dbc
commit 4ef55e67a2
6 changed files with 283 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
base/base.user.js
View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.5 // @version 1.6
// @description Multiple solutions for blocking Twitch ads // @description Multiple solutions for blocking Twitch ads
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
@ -15,8 +15,6 @@
scope.OPT_ROLLING_DEVICE_ID = false; scope.OPT_ROLLING_DEVICE_ID = false;
scope.OPT_MODE_STRIP_AD_SEGMENTS = false; scope.OPT_MODE_STRIP_AD_SEGMENTS = false;
scope.OPT_MODE_NOTIFY_ADS_WATCHED = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED = false;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST = false;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION = 10000;// In milliseconds
scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false;
scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome';
@ -154,24 +152,9 @@
streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"'); streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"');
postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll}); postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll});
// Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early. // Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early.
if (OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST && streamInfo != null && !streamInfo.NotifyObservedNoAds) { // Deferred to after backup obtained to reduce slowdown. Midrolls are futile.
var noAds = false; if (OPT_MODE_NOTIFY_ADS_WATCHED && !streamInfo.IsMidroll && (streamInfo.BackupFailed || streamInfo.BackupUrl != null)) {
var encodingsM3u8Response = await realFetch(streamInfo.RootM3U8Url); await tryNotifyAdsWatchedM3U8(textStr);
if (encodingsM3u8Response.status === 200) {
var encodingsM3u8 = await encodingsM3u8Response.text();
var streamM3u8Url = encodingsM3u8.match(/^https:.*\.m3u8$/m)[0];
var streamM3u8Response = await realFetch(streamM3u8Url);
if (streamM3u8Response.status == 200) {
noAds = (await tryNotifyAdsWatchedM3U8(await streamM3u8Response.text())) == 1;
console.log('Notify ad watched. Response has ads: ' + !noAds);
}
}
if (streamInfo.NotifyFirstTime == 0) {
streamInfo.NotifyFirstTime = Date.now();
}
if (noAds && !streamInfo.NotifyObservedNoAds && Date.now() >= streamInfo.NotifyFirstTime + OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION) {
streamInfo.NotifyObservedNoAds = true;
}
} }
postMessage({ postMessage({
key: 'UboFoundAdSegment', key: 'UboFoundAdSegment',
@ -353,12 +336,6 @@
streamInfo.BackupRegRes = null; streamInfo.BackupRegRes = null;
streamInfo.IsMidroll = false; streamInfo.IsMidroll = false;
streamInfo.HadAds = false; streamInfo.HadAds = false;
streamInfo.NotifyFirstTime = 0;
streamInfo.NotifyObservedNoAds = false;
streamInfo.RealSeqNumber = -1;
streamInfo.BackupSeqNumber = -1;
streamInfo.FakeSeqNumber = 0;
streamInfo.FinalSegUrl = null;
var lines = encodingsM3u8.replace('\r', '').split('\n'); var lines = encodingsM3u8.replace('\r', '').split('\n');
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) { if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) {
@ -447,6 +424,7 @@
})); }));
} }
async function tryNotifyAdsWatchedM3U8(streamM3u8) { async function tryNotifyAdsWatchedM3U8(streamM3u8) {
try {
//console.log(streamM3u8); //console.log(streamM3u8);
if (!streamM3u8.includes(AD_SIGNIFIER)) { if (!streamM3u8.includes(AD_SIGNIFIER)) {
return 1; return 1;
@ -499,6 +477,10 @@
} }
} }
return 0; return 0;
} catch (err) {
console.log(err);
return 0;
}
} }
function hookFetch() { function hookFetch() {
var realFetch = window.fetch; var realFetch = window.fetch;

34
notify-reload/notify-reload-ublock-origin.js
View File

@ -6,8 +6,6 @@ twitch-videoad.js application/javascript
scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_ROLLING_DEVICE_ID = true;
scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST = false;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION = 10000;// In milliseconds
scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = true;
scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome';
@ -145,24 +143,9 @@ twitch-videoad.js application/javascript
streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"'); streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"');
postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll}); postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll});
// Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early. // Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early.
if (OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST && streamInfo != null && !streamInfo.NotifyObservedNoAds) { // Deferred to after backup obtained to reduce slowdown. Midrolls are futile.
var noAds = false; if (OPT_MODE_NOTIFY_ADS_WATCHED && !streamInfo.IsMidroll && (streamInfo.BackupFailed || streamInfo.BackupUrl != null)) {
var encodingsM3u8Response = await realFetch(streamInfo.RootM3U8Url); await tryNotifyAdsWatchedM3U8(textStr);
if (encodingsM3u8Response.status === 200) {
var encodingsM3u8 = await encodingsM3u8Response.text();
var streamM3u8Url = encodingsM3u8.match(/^https:.*\.m3u8$/m)[0];
var streamM3u8Response = await realFetch(streamM3u8Url);
if (streamM3u8Response.status == 200) {
noAds = (await tryNotifyAdsWatchedM3U8(await streamM3u8Response.text())) == 1;
console.log('Notify ad watched. Response has ads: ' + !noAds);
}
}
if (streamInfo.NotifyFirstTime == 0) {
streamInfo.NotifyFirstTime = Date.now();
}
if (noAds && !streamInfo.NotifyObservedNoAds && Date.now() >= streamInfo.NotifyFirstTime + OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION) {
streamInfo.NotifyObservedNoAds = true;
}
} }
postMessage({ postMessage({
key: 'UboFoundAdSegment', key: 'UboFoundAdSegment',
@ -344,12 +327,6 @@ twitch-videoad.js application/javascript
streamInfo.BackupRegRes = null; streamInfo.BackupRegRes = null;
streamInfo.IsMidroll = false; streamInfo.IsMidroll = false;
streamInfo.HadAds = false; streamInfo.HadAds = false;
streamInfo.NotifyFirstTime = 0;
streamInfo.NotifyObservedNoAds = false;
streamInfo.RealSeqNumber = -1;
streamInfo.BackupSeqNumber = -1;
streamInfo.FakeSeqNumber = 0;
streamInfo.FinalSegUrl = null;
var lines = encodingsM3u8.replace('\r', '').split('\n'); var lines = encodingsM3u8.replace('\r', '').split('\n');
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) { if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) {
@ -438,6 +415,7 @@ twitch-videoad.js application/javascript
})); }));
} }
async function tryNotifyAdsWatchedM3U8(streamM3u8) { async function tryNotifyAdsWatchedM3U8(streamM3u8) {
try {
//console.log(streamM3u8); //console.log(streamM3u8);
if (!streamM3u8.includes(AD_SIGNIFIER)) { if (!streamM3u8.includes(AD_SIGNIFIER)) {
return 1; return 1;
@ -490,6 +468,10 @@ twitch-videoad.js application/javascript
} }
} }
return 0; return 0;
} catch (err) {
console.log(err);
return 0;
}
} }
function hookFetch() { function hookFetch() {
var realFetch = window.fetch; var realFetch = window.fetch;

36
notify-reload/notify-reload.user.js
View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions (notify-reload) // @name TwitchAdSolutions (notify-reload)
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.5 // @version 1.6
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-reload/notify-reload.user.js // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-reload/notify-reload.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-reload/notify-reload.user.js // @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-reload/notify-reload.user.js
// @description Multiple solutions for blocking Twitch ads (notify-reload) // @description Multiple solutions for blocking Twitch ads (notify-reload)
@ -17,8 +17,6 @@
scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_ROLLING_DEVICE_ID = true;
scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST = false;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION = 10000;// In milliseconds
scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = true;
scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome';
@ -156,24 +154,9 @@
streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"'); streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"');
postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll}); postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll});
// Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early. // Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early.
if (OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST && streamInfo != null && !streamInfo.NotifyObservedNoAds) { // Deferred to after backup obtained to reduce slowdown. Midrolls are futile.
var noAds = false; if (OPT_MODE_NOTIFY_ADS_WATCHED && !streamInfo.IsMidroll && (streamInfo.BackupFailed || streamInfo.BackupUrl != null)) {
var encodingsM3u8Response = await realFetch(streamInfo.RootM3U8Url); await tryNotifyAdsWatchedM3U8(textStr);
if (encodingsM3u8Response.status === 200) {
var encodingsM3u8 = await encodingsM3u8Response.text();
var streamM3u8Url = encodingsM3u8.match(/^https:.*\.m3u8$/m)[0];
var streamM3u8Response = await realFetch(streamM3u8Url);
if (streamM3u8Response.status == 200) {
noAds = (await tryNotifyAdsWatchedM3U8(await streamM3u8Response.text())) == 1;
console.log('Notify ad watched. Response has ads: ' + !noAds);
}
}
if (streamInfo.NotifyFirstTime == 0) {
streamInfo.NotifyFirstTime = Date.now();
}
if (noAds && !streamInfo.NotifyObservedNoAds && Date.now() >= streamInfo.NotifyFirstTime + OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION) {
streamInfo.NotifyObservedNoAds = true;
}
} }
postMessage({ postMessage({
key: 'UboFoundAdSegment', key: 'UboFoundAdSegment',
@ -355,12 +338,6 @@
streamInfo.BackupRegRes = null; streamInfo.BackupRegRes = null;
streamInfo.IsMidroll = false; streamInfo.IsMidroll = false;
streamInfo.HadAds = false; streamInfo.HadAds = false;
streamInfo.NotifyFirstTime = 0;
streamInfo.NotifyObservedNoAds = false;
streamInfo.RealSeqNumber = -1;
streamInfo.BackupSeqNumber = -1;
streamInfo.FakeSeqNumber = 0;
streamInfo.FinalSegUrl = null;
var lines = encodingsM3u8.replace('\r', '').split('\n'); var lines = encodingsM3u8.replace('\r', '').split('\n');
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) { if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) {
@ -449,6 +426,7 @@
})); }));
} }
async function tryNotifyAdsWatchedM3U8(streamM3u8) { async function tryNotifyAdsWatchedM3U8(streamM3u8) {
try {
//console.log(streamM3u8); //console.log(streamM3u8);
if (!streamM3u8.includes(AD_SIGNIFIER)) { if (!streamM3u8.includes(AD_SIGNIFIER)) {
return 1; return 1;
@ -501,6 +479,10 @@
} }
} }
return 0; return 0;
} catch (err) {
console.log(err);
return 0;
}
} }
function hookFetch() { function hookFetch() {
var realFetch = window.fetch; var realFetch = window.fetch;

34
notify-strip/notify-strip-ublock-origin.js
View File

@ -6,8 +6,6 @@ twitch-videoad.js application/javascript
scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_ROLLING_DEVICE_ID = true;
scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION = 10000;// In milliseconds
scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false;
scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome';
@ -145,24 +143,9 @@ twitch-videoad.js application/javascript
streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"'); streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"');
postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll}); postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll});
// Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early. // Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early.
if (OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST && streamInfo != null && !streamInfo.NotifyObservedNoAds) { // Deferred to after backup obtained to reduce slowdown. Midrolls are futile.
var noAds = false; if (OPT_MODE_NOTIFY_ADS_WATCHED && !streamInfo.IsMidroll && (streamInfo.BackupFailed || streamInfo.BackupUrl != null)) {
var encodingsM3u8Response = await realFetch(streamInfo.RootM3U8Url); await tryNotifyAdsWatchedM3U8(textStr);
if (encodingsM3u8Response.status === 200) {
var encodingsM3u8 = await encodingsM3u8Response.text();
var streamM3u8Url = encodingsM3u8.match(/^https:.*\.m3u8$/m)[0];
var streamM3u8Response = await realFetch(streamM3u8Url);
if (streamM3u8Response.status == 200) {
noAds = (await tryNotifyAdsWatchedM3U8(await streamM3u8Response.text())) == 1;
console.log('Notify ad watched. Response has ads: ' + !noAds);
}
}
if (streamInfo.NotifyFirstTime == 0) {
streamInfo.NotifyFirstTime = Date.now();
}
if (noAds && !streamInfo.NotifyObservedNoAds && Date.now() >= streamInfo.NotifyFirstTime + OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION) {
streamInfo.NotifyObservedNoAds = true;
}
} }
postMessage({ postMessage({
key: 'UboFoundAdSegment', key: 'UboFoundAdSegment',
@ -344,12 +327,6 @@ twitch-videoad.js application/javascript
streamInfo.BackupRegRes = null; streamInfo.BackupRegRes = null;
streamInfo.IsMidroll = false; streamInfo.IsMidroll = false;
streamInfo.HadAds = false; streamInfo.HadAds = false;
streamInfo.NotifyFirstTime = 0;
streamInfo.NotifyObservedNoAds = false;
streamInfo.RealSeqNumber = -1;
streamInfo.BackupSeqNumber = -1;
streamInfo.FakeSeqNumber = 0;
streamInfo.FinalSegUrl = null;
var lines = encodingsM3u8.replace('\r', '').split('\n'); var lines = encodingsM3u8.replace('\r', '').split('\n');
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) { if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) {
@ -438,6 +415,7 @@ twitch-videoad.js application/javascript
})); }));
} }
async function tryNotifyAdsWatchedM3U8(streamM3u8) { async function tryNotifyAdsWatchedM3U8(streamM3u8) {
try {
//console.log(streamM3u8); //console.log(streamM3u8);
if (!streamM3u8.includes(AD_SIGNIFIER)) { if (!streamM3u8.includes(AD_SIGNIFIER)) {
return 1; return 1;
@ -490,6 +468,10 @@ twitch-videoad.js application/javascript
} }
} }
return 0; return 0;
} catch (err) {
console.log(err);
return 0;
}
} }
function hookFetch() { function hookFetch() {
var realFetch = window.fetch; var realFetch = window.fetch;

1
notify-strip/notify-strip.cfg
View File

@ -1,5 +1,4 @@
OPT_ROLLING_DEVICE_ID true OPT_ROLLING_DEVICE_ID true
OPT_MODE_STRIP_AD_SEGMENTS true OPT_MODE_STRIP_AD_SEGMENTS true
OPT_MODE_NOTIFY_ADS_WATCHED true OPT_MODE_NOTIFY_ADS_WATCHED true
OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST true
OPT_ACCESS_TOKEN_PLAYER_TYPE 'site' OPT_ACCESS_TOKEN_PLAYER_TYPE 'site'

36
notify-strip/notify-strip.user.js
View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions (notify-strip) // @name TwitchAdSolutions (notify-strip)
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.5 // @version 1.6
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-strip/notify-strip.user.js // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-strip/notify-strip.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-strip/notify-strip.user.js // @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-strip/notify-strip.user.js
// @description Multiple solutions for blocking Twitch ads (notify-strip) // @description Multiple solutions for blocking Twitch ads (notify-strip)
@ -17,8 +17,6 @@
scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_ROLLING_DEVICE_ID = true;
scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION = 10000;// In milliseconds
scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true;
scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false;
scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome';
@ -156,24 +154,9 @@
streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"'); streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"');
postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll}); postMessage({key:'UboShowAdBanner',isMidroll:streamInfo.IsMidroll});
// Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early. // Notify ads "watched" TODO: Keep crafting these requests even after ad tags are gone as sometimes it stops too early.
if (OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST && streamInfo != null && !streamInfo.NotifyObservedNoAds) { // Deferred to after backup obtained to reduce slowdown. Midrolls are futile.
var noAds = false; if (OPT_MODE_NOTIFY_ADS_WATCHED && !streamInfo.IsMidroll && (streamInfo.BackupFailed || streamInfo.BackupUrl != null)) {
var encodingsM3u8Response = await realFetch(streamInfo.RootM3U8Url); await tryNotifyAdsWatchedM3U8(textStr);
if (encodingsM3u8Response.status === 200) {
var encodingsM3u8 = await encodingsM3u8Response.text();
var streamM3u8Url = encodingsM3u8.match(/^https:.*\.m3u8$/m)[0];
var streamM3u8Response = await realFetch(streamM3u8Url);
if (streamM3u8Response.status == 200) {
noAds = (await tryNotifyAdsWatchedM3U8(await streamM3u8Response.text())) == 1;
console.log('Notify ad watched. Response has ads: ' + !noAds);
}
}
if (streamInfo.NotifyFirstTime == 0) {
streamInfo.NotifyFirstTime = Date.now();
}
if (noAds && !streamInfo.NotifyObservedNoAds && Date.now() >= streamInfo.NotifyFirstTime + OPT_MODE_NOTIFY_ADS_WATCHED_PERSIST_EXPECTED_DURATION) {
streamInfo.NotifyObservedNoAds = true;
}
} }
postMessage({ postMessage({
key: 'UboFoundAdSegment', key: 'UboFoundAdSegment',
@ -355,12 +338,6 @@
streamInfo.BackupRegRes = null; streamInfo.BackupRegRes = null;
streamInfo.IsMidroll = false; streamInfo.IsMidroll = false;
streamInfo.HadAds = false; streamInfo.HadAds = false;
streamInfo.NotifyFirstTime = 0;
streamInfo.NotifyObservedNoAds = false;
streamInfo.RealSeqNumber = -1;
streamInfo.BackupSeqNumber = -1;
streamInfo.FakeSeqNumber = 0;
streamInfo.FinalSegUrl = null;
var lines = encodingsM3u8.replace('\r', '').split('\n'); var lines = encodingsM3u8.replace('\r', '').split('\n');
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) { if (!lines[i].startsWith('#') && lines[i].includes('.m3u8')) {
@ -449,6 +426,7 @@
})); }));
} }
async function tryNotifyAdsWatchedM3U8(streamM3u8) { async function tryNotifyAdsWatchedM3U8(streamM3u8) {
try {
//console.log(streamM3u8); //console.log(streamM3u8);
if (!streamM3u8.includes(AD_SIGNIFIER)) { if (!streamM3u8.includes(AD_SIGNIFIER)) {
return 1; return 1;
@ -501,6 +479,10 @@
} }
} }
return 0; return 0;
} catch (err) {
console.log(err);
return 0;
}
} }
function hookFetch() { function hookFetch() {
var realFetch = window.fetch; var realFetch = window.fetch;