TwitchAdSolutions
Code Issues

Add dyn-skip-midroll-alt

Browse Source
This commit is contained in:
pixeltris
2020-12-29 16:37:15 +00:00
parent ce281695e1
commit f743a866ca
18 changed files with 2771 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/base.user.js
+99 -71
View File
@@ -21,6 +21,7 @@
scope.OPT_MODE_NOTIFY_ADS_WATCHED_ATTEMPTS = 2;// Larger values might increase load time. Lower values may increase ad chance.
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_DELAY = 0;
scope.OPT_MODE_PROXY_M3U8 = '';
scope.OPT_VIDEO_SWAP_PLAYER_TYPE = 'thunderdome';
scope.OPT_INITIAL_M3U8_ATTEMPTS = 1;
@@ -39,6 +40,7 @@
// These are only really for Worker scope...
scope.StreamInfos = [];
scope.StreamInfosByUrl = [];
scope.CurrentChannelNameFromM3U8 = null;
}
declareOptions(window);
////////////////////////////////////
@@ -50,6 +52,7 @@
var foundAdContainer = false;// Have ad containers been found (the clickable ad)
var foundAdBanner = false;// Is the ad banner visible (top left of screen)
////////////////////////////////////
var notifyAdsWatchedReloadNextTime = 0;
var gql_device_id = null;
var twitchMainWorker = null;
const oldWorker = window.Worker;
@@ -86,7 +89,10 @@
adDiv.style.display = 'none';
}
else if (e.data.key == 'UboFoundAdSegment') {
onFoundAd(e.data.hasLiveSeg);
onFoundAd(e.data.hasLiveSeg, e.data.streamM3u8);
} else if (e.data.key == 'UboChannelNameM3U8Changed') {
//console.log('M3U8 channel name changed to ' + e.data.value);
notifyAdsWatchedReloadNextTime = 0;
}
}
function getAdDiv() {
@@ -131,23 +137,27 @@
if (haveAdTags) {
postMessage({
key: 'UboFoundAdSegment',
hasLiveSeg: textStr.includes(LIVE_SIGNIFIER)
hasLiveSeg: textStr.includes(LIVE_SIGNIFIER),
streamM3u8: textStr
});
}
if (!OPT_MODE_STRIP_AD_SEGMENTS) {
return textStr;
}
var streamInfo = StreamInfosByUrl[url];
if (streamInfo == null) {
console.log('Unknown stream url!');
return textStr;
}
if (haveAdTags && !textStr.includes(LIVE_SIGNIFIER)) {
postMessage({key:'UboShowAdBanner'});
} else {
postMessage({key:'UboHideAdBanner'});
}
if (haveAdTags) {
if (OPT_MODE_NOTIFY_ADS_WATCHED) {
console.log('Stripping ads (instead of skipping ads)');
}
var streamInfo = StreamInfosByUrl[url];
if (streamInfo == null) {
console.log('Unknown stream url! ' + url);
return textStr;
}
if (!streamInfo.BackupFailed && streamInfo.BackupUrl == null) {
// NOTE: We currently don't fetch the oauth_token. You wont be able to access private streams like this.
streamInfo.BackupFailed = true;
@@ -194,6 +204,7 @@
var segTimes = getSegmentTimes(lines);
var backupSegTimes = getSegmentTimes(backupLines);
for (const [segTime, segUrl] of Object.entries(segTimes)) {
//segmentMap[segUrl] = Object.values(backupSegTimes)[Object.keys(backupSegTimes).length-1];
var closestTime = Number.MAX_VALUE;
var matchingBackupTime = Number.MAX_VALUE;
for (const [backupSegTime, backupSegUrl] of Object.entries(backupSegTimes)) {
@@ -247,8 +258,15 @@
});
}
else if (url.includes('/api/channel/hls/') && !url.includes('picture-by-picture')) {
var channelName = (new URL(url)).pathname.match(/([^\/]+)(?=\.\w+$)/)[0];
if (CurrentChannelNameFromM3U8 != channelName) {
postMessage({
key: 'UboChannelNameM3U8Changed',
value: channelName
});
}
CurrentChannelNameFromM3U8 = channelName;
if (OPT_MODE_PROXY_M3U8) {
var channelName = (new URL(url)).pathname.match(/([^\/]+)(?=\.\w+$)/)[0];
url = OPT_MODE_PROXY_M3U8 + channelName;
console.log('Proxy: ' + url);
}
@@ -269,7 +287,6 @@
if (maxAttempts > 1 && attempts >= maxAttempts) {
console.log('max skip ad attempts reached (attempt #' + attempts + ')');
}
var channelName = (new URL(url)).pathname.match(/([^\/]+)(?=\.\w+$)/)[0];
var streamInfo = StreamInfos[channelName];
if (streamInfo == null) {
StreamInfos[channelName] = streamInfo = {};
@@ -344,7 +361,61 @@
return [key, Number.isNaN(num) ? value.startsWith('"') ? JSON.parse(value) : value : num]
}));
}
async function tryNotifyAdsWatched(realFetch, i, sig, token) {
async function tryNotifyAdsWatchedM3U8(streamM3u8) {
//console.log(streamM3u8);
if (!streamM3u8.includes(AD_SIGNIFIER)) {
return 1;
}
var matches = streamM3u8.match(/#EXT-X-DATERANGE:(ID="stitched-ad-[^\n]+)\n/);
if (matches.length > 1) {
const attrString = matches[1];
const attr = parseAttributes(attrString);
var podLength = parseInt(attr['X-TV-TWITCH-AD-POD-LENGTH'] ? attr['X-TV-TWITCH-AD-POD-LENGTH'] : '1');
var podPosition = parseInt(attr['X-TV-TWITCH-AD-POD-POSITION'] ? attr['X-TV-TWITCH-AD-POD-POSITION'] : '0');
var radToken = attr['X-TV-TWITCH-AD-RADS-TOKEN'];
var lineItemId = attr['X-TV-TWITCH-AD-LINE-ITEM-ID'];
var orderId = attr['X-TV-TWITCH-AD-ORDER-ID'];
var creativeId = attr['X-TV-TWITCH-AD-CREATIVE-ID'];
var adId = attr['X-TV-TWITCH-AD-ADVERTISER-ID'];
var rollType = attr['X-TV-TWITCH-AD-ROLL-TYPE'].toLowerCase();
const baseData = {
stitched: true,
roll_type: rollType,
player_mute: false,
player_volume: 0.5,
visible: true,
};
for (let podPosition = 0; podPosition < podLength; podPosition++) {
if (OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS) {
// This is all that's actually required at the moment
await gqlRequest(makeGraphQlPacket('video_ad_pod_complete', radToken, baseData));
} else {
const extendedData = {
...baseData,
ad_id: adId,
ad_position: podPosition,
duration: 30,
creative_id: creativeId,
total_ads: podLength,
order_id: orderId,
line_item_id: lineItemId,
};
await gqlRequest(makeGraphQlPacket('video_ad_impression', radToken, extendedData));
for (let quartile = 0; quartile < 4; quartile++) {
await gqlRequest(
makeGraphQlPacket('video_ad_quartile_complete', radToken, {
...extendedData,
quartile: quartile + 1,
})
);
}
await gqlRequest(makeGraphQlPacket('video_ad_pod_complete', radToken, baseData));
}
}
}
return 0;
}
async function tryNotifyAdsWatchedSigTok(realFetch, i, sig, token) {
var tokInfo = JSON.parse(token);
var channelName = tokInfo.channel;
var urlInfo = new URL('https://usher.ttvnw.net/api/channel/hls/' + channelName + '.m3u8');
@@ -356,60 +427,13 @@
var streamM3u8Url = encodingsM3u8.match(/^https:.*\.m3u8$/m)[0];
var streamM3u8Response = await realFetch(streamM3u8Url);
var streamM3u8 = await streamM3u8Response.text();
//console.log(streamM3u8);
if (streamM3u8.includes(AD_SIGNIFIER)) {
console.log('ad at req ' + i);
var matches = streamM3u8.match(/#EXT-X-DATERANGE:(ID="stitched-ad-[^\n]+)\n/);
if (matches.length > 1) {
const attrString = matches[1];
const attr = parseAttributes(attrString);
var podLength = parseInt(attr['X-TV-TWITCH-AD-POD-LENGTH'] ? attr['X-TV-TWITCH-AD-POD-LENGTH'] : '1');
var podPosition = parseInt(attr['X-TV-TWITCH-AD-POD-POSITION'] ? attr['X-TV-TWITCH-AD-POD-POSITION'] : '0');
var radToken = attr['X-TV-TWITCH-AD-RADS-TOKEN'];
var lineItemId = attr['X-TV-TWITCH-AD-LINE-ITEM-ID'];
var orderId = attr['X-TV-TWITCH-AD-ORDER-ID'];
var creativeId = attr['X-TV-TWITCH-AD-CREATIVE-ID'];
var adId = attr['X-TV-TWITCH-AD-ADVERTISER-ID'];
var rollType = attr['X-TV-TWITCH-AD-ROLL-TYPE'].toLowerCase();
const baseData = {
stitched: true,
roll_type: rollType,
player_mute: false,
player_volume: 0.5,
visible: true,
};
for (let podPosition = 0; podPosition < podLength; podPosition++) {
if (OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS) {
// This is all that's actually required at the moment
await gqlRequest(makeGraphQlPacket('video_ad_pod_complete', radToken, baseData));
} else {
const extendedData = {
...baseData,
ad_id: adId,
ad_position: podPosition,
duration: 30,
creative_id: creativeId,
total_ads: podLength,
order_id: orderId,
line_item_id: lineItemId,
};
await gqlRequest(makeGraphQlPacket('video_ad_impression', radToken, extendedData));
for (let quartile = 0; quartile < 4; quartile++) {
await gqlRequest(
makeGraphQlPacket('video_ad_quartile_complete', radToken, {
...extendedData,
quartile: quartile + 1,
})
);
}
await gqlRequest(makeGraphQlPacket('video_ad_pod_complete', radToken, baseData));
}
}
}
} else {
var res = await tryNotifyAdsWatchedM3U8(streamM3u8);
if (res) {
console.log("no ad at req " + i);
return 1;
} else {
console.log('ad at req ' + i);
}
return res;
} else {
// http error
return 2;
@@ -451,7 +475,7 @@
var cloned = response.clone();
var responseData = await cloned.json();
if (responseData && responseData.sig && responseData.token) {
if (await tryNotifyAdsWatched(realFetch, i, responseData.sig, responseData.token) > 0) {
if (await tryNotifyAdsWatchedSigTok(realFetch, i, responseData.sig, responseData.token) > 0) {
break;
}
} else {
@@ -473,7 +497,7 @@
var cloned = response.clone();
var responseData = await cloned.json();
if (responseData && responseData.data && responseData.data.streamPlaybackAccessToken && responseData.data.streamPlaybackAccessToken.value && responseData.data.streamPlaybackAccessToken.signature) {
if (await tryNotifyAdsWatched(realFetch, i, responseData.data.streamPlaybackAccessToken.signature, responseData.data.streamPlaybackAccessToken.value) > 0) {
if (await tryNotifyAdsWatchedSigTok(realFetch, i, responseData.data.streamPlaybackAccessToken.signature, responseData.data.streamPlaybackAccessToken.value) > 0) {
break;
}
} else {
@@ -494,9 +518,13 @@
return realFetch.apply(this, arguments);
}
}
function onFoundAd(hasLiveSeg) {
if (OPT_MODE_NOTIFY_ADS_WATCHED && OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT) {
function onFoundAd(hasLiveSeg, streamM3u8) {
if (OPT_MODE_NOTIFY_ADS_WATCHED && OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT && Date.now() >= notifyAdsWatchedReloadNextTime) {
console.log('OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT');
notifyAdsWatchedReloadNextTime = Date.now() + OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT_DELAY;
if (streamM3u8) {
tryNotifyAdsWatchedM3U8(streamM3u8);
}
reloadTwitchPlayer();
return;
}
@@ -536,7 +564,7 @@
var createTempStream = async function() {
// Create new video stream TODO: Do this with callbacks
var channelName = window.location.pathname.substr(1);// TODO: Better way of determining the channel name
var tempM3u8 = null;
var tempM3u8Url = null;
var accessTokenResponse = await fetch('https://api.twitch.tv/api/channels/' + channelName + '/access_token?oauth_token=undefined&need_https=true&platform=web&player_type=' + OPT_VIDEO_SWAP_PLAYER_TYPE + '&player_backend=mediaplayer', {headers:{'client-id':CLIENT_ID}});
if (accessTokenResponse.status === 200) {
var accessToken = JSON.parse(await accessTokenResponse.text());
@@ -551,7 +579,7 @@
// Maybe this request is a bit unnecessary
var streamM3u8Response = await fetch(streamM3u8Url);
if (streamM3u8Response.status == 200) {
tempM3u8 = streamM3u8Url;
tempM3u8Url = streamM3u8Url;
} else {
console.log('Backup url request (streamM3u8) failed with ' + streamM3u8Response.status);
}
@@ -561,7 +589,7 @@
} else {
console.log('Backup url request (accessToken) failed with ' + accessTokenResponse.status);
}
if (tempM3u8 != null) {
if (tempM3u8Url != null) {
tempVideo = document.createElement('video');
tempVideo.autoplay = true;
tempVideo.volume = originalVolume;
@@ -569,11 +597,11 @@
disabledVideo.parentElement.insertBefore(tempVideo, disabledVideo.nextSibling);
if (Hls.isSupported()) {
tempVideo.hls = new Hls();
tempVideo.hls.loadSource(tempM3u8);
tempVideo.hls.loadSource(tempM3u8Url);
tempVideo.hls.attachMedia(tempVideo);
}
console.log(tempVideo);
console.log(tempM3u8);
console.log(tempM3u8Url);
}
};
createTempStream();