Fix backup player types #471
Also fixed video-swap-new not working correctly in Firefox on embeded pages
This commit is contained in:
pixeltris
+86
-45
@@ -2,7 +2,7 @@ twitch-videoad.js text/javascript
|
|||||||
(function() {
|
(function() {
|
||||||
if ( /(^|\.)twitch\.tv$/.test(document.location.hostname) === false ) { return; }
|
if ( /(^|\.)twitch\.tv$/.test(document.location.hostname) === false ) { return; }
|
||||||
'use strict';
|
'use strict';
|
||||||
var ourTwitchAdSolutionsVersion = 15;// Used to prevent conflicts with outdated versions of the scripts
|
var ourTwitchAdSolutionsVersion = 16;// Used to prevent conflicts with outdated versions of the scripts
|
||||||
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
||||||
console.log("skipping vaft as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
console.log("skipping vaft as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
||||||
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||||
@@ -22,6 +22,7 @@ twitch-videoad.js text/javascript
|
|||||||
scope.SkipPlayerReloadOnHevc = false;// If true this will skip player reload on streams which have 2k/4k quality (if you enable this and you use the 2k/4k quality setting you'll get error #4000 / #3000 / spinning wheel on chrome based browsers)
|
scope.SkipPlayerReloadOnHevc = false;// If true this will skip player reload on streams which have 2k/4k quality (if you enable this and you use the 2k/4k quality setting you'll get error #4000 / #3000 / spinning wheel on chrome based browsers)
|
||||||
scope.AlwaysReloadPlayerOnAd = false;
|
scope.AlwaysReloadPlayerOnAd = false;
|
||||||
scope.PlayerReloadLowResTime = 1500;
|
scope.PlayerReloadLowResTime = 1500;
|
||||||
|
scope.DisableMatureConentPopup = false;// If true this avoids having to log in to watch age gated content
|
||||||
scope.StreamInfos = [];
|
scope.StreamInfos = [];
|
||||||
scope.StreamInfosByUrl = [];
|
scope.StreamInfosByUrl = [];
|
||||||
scope.GQLDeviceID = null;
|
scope.GQLDeviceID = null;
|
||||||
@@ -532,7 +533,7 @@ twitch-videoad.js text/javascript
|
|||||||
if (playerType == FallbackPlayerType) {
|
if (playerType == FallbackPlayerType) {
|
||||||
fallbackM3u8 = m3u8Text;
|
fallbackM3u8 = m3u8Text;
|
||||||
}
|
}
|
||||||
if (!m3u8Text.includes(AdSignifier) && (SimulatedAdsDepth == 0 || playerTypeIndex >= SimulatedAdsDepth - 1)) {
|
if ((!m3u8Text.includes(AdSignifier) && (SimulatedAdsDepth == 0 || playerTypeIndex >= SimulatedAdsDepth - 1)) || (!fallbackM3u8 && playerTypeIndex >= BackupPlayerTypes.length - 1)) {
|
||||||
backupPlayerType = playerType;
|
backupPlayerType = playerType;
|
||||||
backupM3u8 = m3u8Text;
|
backupM3u8 = m3u8Text;
|
||||||
break;
|
break;
|
||||||
@@ -601,9 +602,9 @@ twitch-videoad.js text/javascript
|
|||||||
'playerType': playerType
|
'playerType': playerType
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return gqlRequest(body);
|
return gqlRequest(body, playerType);
|
||||||
}
|
}
|
||||||
function gqlRequest(body) {
|
function gqlRequest(body, playerType) {
|
||||||
if (!GQLDeviceID) {
|
if (!GQLDeviceID) {
|
||||||
var dcharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
var dcharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
||||||
var dcharactersLength = dcharacters.length;
|
var dcharactersLength = dcharacters.length;
|
||||||
@@ -620,6 +621,12 @@ twitch-videoad.js text/javascript
|
|||||||
...(ClientVersion && {'Client-Version': ClientVersion}),
|
...(ClientVersion && {'Client-Version': ClientVersion}),
|
||||||
...(ClientSession && {'Client-Session-Id': ClientSession})
|
...(ClientSession && {'Client-Session-Id': ClientSession})
|
||||||
};
|
};
|
||||||
|
if (playerType != 'site') {
|
||||||
|
headers = {
|
||||||
|
'Client-Id': ClientID,
|
||||||
|
'X-Device-Id': GQLDeviceID
|
||||||
|
};
|
||||||
|
}
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const requestId = Math.random().toString(36).substring(2, 15);
|
const requestId = Math.random().toString(36).substring(2, 15);
|
||||||
const fetchRequest = {
|
const fetchRequest = {
|
||||||
@@ -698,23 +705,36 @@ twitch-videoad.js text/javascript
|
|||||||
const lsKeyQuality = 'video-quality';
|
const lsKeyQuality = 'video-quality';
|
||||||
const lsKeyMuted = 'video-muted';
|
const lsKeyMuted = 'video-muted';
|
||||||
const lsKeyVolume = 'volume';
|
const lsKeyVolume = 'volume';
|
||||||
var currentQualityLS = localStorage.getItem(lsKeyQuality);
|
var currentQualityLS = null;
|
||||||
var currentMutedLS = localStorage.getItem(lsKeyMuted);
|
var currentMutedLS = null;
|
||||||
var currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
var currentVolumeLS = null;
|
||||||
if (localStorageHookFailed && player?.core?.state) {
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
currentQualityLS = localStorage.getItem(lsKeyQuality);
|
||||||
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
currentMutedLS = localStorage.getItem(lsKeyMuted);
|
||||||
}
|
currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
||||||
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
if (localStorageHookFailed && player?.core?.state) {
|
||||||
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
||||||
}
|
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
||||||
|
}
|
||||||
|
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
||||||
|
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
||||||
player.play();
|
player.play();
|
||||||
if (localStorageHookFailed) {
|
if (localStorageHookFailed && (currentQualityLS || currentMutedLS || currentVolumeLS)) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
if (currentQualityLS) {
|
||||||
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
||||||
|
}
|
||||||
|
if (currentMutedLS) {
|
||||||
|
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
||||||
|
}
|
||||||
|
if (currentVolumeLS) {
|
||||||
|
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -772,7 +792,7 @@ twitch-videoad.js text/javascript
|
|||||||
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
||||||
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
||||||
}
|
}
|
||||||
if (ForceAccessTokenPlayerType && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture')) {
|
if (ForceAccessTokenPlayerType && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture') && !init.body.includes('frontpage')) {
|
||||||
let replacedPlayerType = '';
|
let replacedPlayerType = '';
|
||||||
const newBody = JSON.parse(init.body);
|
const newBody = JSON.parse(init.body);
|
||||||
if (Array.isArray(newBody)) {
|
if (Array.isArray(newBody)) {
|
||||||
@@ -793,6 +813,22 @@ twitch-videoad.js text/javascript
|
|||||||
init.body = JSON.stringify(newBody);
|
init.body = JSON.stringify(newBody);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (DisableMatureConentPopup) {
|
||||||
|
const newBody2 = JSON.parse(init.body);
|
||||||
|
if (Array.isArray(newBody2)) {
|
||||||
|
var hasRemovedClassification = false;
|
||||||
|
for (let i = 0; i < newBody2.length; i++) {
|
||||||
|
if (newBody2[i]?.operationName == 'ContentClassificationContext') {
|
||||||
|
hasRemovedClassification = true;
|
||||||
|
// Doesn't seem like it if we remove this element from the array so instead we duplicate another entry into this index. TODO: Find out why
|
||||||
|
newBody2[i] = newBody2[i == 0 && newBody2.length > 1 ? 1 : 0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (hasRemovedClassification) {
|
||||||
|
init.body = JSON.stringify(newBody2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return realFetch.apply(this, arguments);
|
return realFetch.apply(this, arguments);
|
||||||
@@ -856,34 +892,39 @@ twitch-videoad.js text/javascript
|
|||||||
}
|
}
|
||||||
}catch{}
|
}catch{}
|
||||||
// Hooks for preserving volume / resolution
|
// Hooks for preserving volume / resolution
|
||||||
var keysToCache = [
|
try {
|
||||||
'video-quality',
|
var keysToCache = [
|
||||||
'video-muted',
|
'video-quality',
|
||||||
'volume',
|
'video-muted',
|
||||||
'lowLatencyModeEnabled',// Low Latency
|
'volume',
|
||||||
'persistenceEnabled',// Mini Player
|
'lowLatencyModeEnabled',// Low Latency
|
||||||
];
|
'persistenceEnabled',// Mini Player
|
||||||
var cachedValues = new Map();
|
];
|
||||||
for (var i = 0; i < keysToCache.length; i++) {
|
var cachedValues = new Map();
|
||||||
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
for (var i = 0; i < keysToCache.length; i++) {
|
||||||
}
|
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
||||||
var realSetItem = localStorage.setItem;
|
|
||||||
localStorage.setItem = function(key, value) {
|
|
||||||
if (cachedValues.has(key)) {
|
|
||||||
cachedValues.set(key, value);
|
|
||||||
}
|
}
|
||||||
realSetItem.apply(this, arguments);
|
var realSetItem = localStorage.setItem;
|
||||||
};
|
localStorage.setItem = function(key, value) {
|
||||||
var realGetItem = localStorage.getItem;
|
if (cachedValues.has(key)) {
|
||||||
localStorage.getItem = function(key) {
|
cachedValues.set(key, value);
|
||||||
if (cachedValues.has(key)) {
|
}
|
||||||
return cachedValues.get(key);
|
realSetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
var realGetItem = localStorage.getItem;
|
||||||
|
localStorage.getItem = function(key) {
|
||||||
|
if (cachedValues.has(key)) {
|
||||||
|
return cachedValues.get(key);
|
||||||
|
}
|
||||||
|
return realGetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
||||||
|
// These hooks are useful to preserve player state on player reload
|
||||||
|
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
||||||
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
return realGetItem.apply(this, arguments);
|
} catch (err) {
|
||||||
};
|
console.log('localStorageHooks failed ' + err)
|
||||||
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
|
||||||
// These hooks are useful to preserve player state on player reload
|
|
||||||
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
|
||||||
localStorageHookFailed = true;
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+87
-46
@@ -1,7 +1,7 @@
|
|||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name TwitchAdSolutions (vaft)
|
// @name TwitchAdSolutions (vaft)
|
||||||
// @namespace https://github.com/pixeltris/TwitchAdSolutions
|
// @namespace https://github.com/pixeltris/TwitchAdSolutions
|
||||||
// @version 28.0.0
|
// @version 29.0.0
|
||||||
// @description Multiple solutions for blocking Twitch ads (vaft)
|
// @description Multiple solutions for blocking Twitch ads (vaft)
|
||||||
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
|
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
|
||||||
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
|
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
// ==/UserScript==
|
// ==/UserScript==
|
||||||
(function() {
|
(function() {
|
||||||
'use strict';
|
'use strict';
|
||||||
var ourTwitchAdSolutionsVersion = 15;// Used to prevent conflicts with outdated versions of the scripts
|
var ourTwitchAdSolutionsVersion = 16;// Used to prevent conflicts with outdated versions of the scripts
|
||||||
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
||||||
console.log("skipping vaft as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
console.log("skipping vaft as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
||||||
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||||
@@ -33,6 +33,7 @@
|
|||||||
scope.SkipPlayerReloadOnHevc = false;// If true this will skip player reload on streams which have 2k/4k quality (if you enable this and you use the 2k/4k quality setting you'll get error #4000 / #3000 / spinning wheel on chrome based browsers)
|
scope.SkipPlayerReloadOnHevc = false;// If true this will skip player reload on streams which have 2k/4k quality (if you enable this and you use the 2k/4k quality setting you'll get error #4000 / #3000 / spinning wheel on chrome based browsers)
|
||||||
scope.AlwaysReloadPlayerOnAd = false;
|
scope.AlwaysReloadPlayerOnAd = false;
|
||||||
scope.PlayerReloadLowResTime = 1500;
|
scope.PlayerReloadLowResTime = 1500;
|
||||||
|
scope.DisableMatureConentPopup = false;// If true this avoids having to log in to watch age gated content
|
||||||
scope.StreamInfos = [];
|
scope.StreamInfos = [];
|
||||||
scope.StreamInfosByUrl = [];
|
scope.StreamInfosByUrl = [];
|
||||||
scope.GQLDeviceID = null;
|
scope.GQLDeviceID = null;
|
||||||
@@ -543,7 +544,7 @@
|
|||||||
if (playerType == FallbackPlayerType) {
|
if (playerType == FallbackPlayerType) {
|
||||||
fallbackM3u8 = m3u8Text;
|
fallbackM3u8 = m3u8Text;
|
||||||
}
|
}
|
||||||
if (!m3u8Text.includes(AdSignifier) && (SimulatedAdsDepth == 0 || playerTypeIndex >= SimulatedAdsDepth - 1)) {
|
if ((!m3u8Text.includes(AdSignifier) && (SimulatedAdsDepth == 0 || playerTypeIndex >= SimulatedAdsDepth - 1)) || (!fallbackM3u8 && playerTypeIndex >= BackupPlayerTypes.length - 1)) {
|
||||||
backupPlayerType = playerType;
|
backupPlayerType = playerType;
|
||||||
backupM3u8 = m3u8Text;
|
backupM3u8 = m3u8Text;
|
||||||
break;
|
break;
|
||||||
@@ -612,9 +613,9 @@
|
|||||||
'playerType': playerType
|
'playerType': playerType
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return gqlRequest(body);
|
return gqlRequest(body, playerType);
|
||||||
}
|
}
|
||||||
function gqlRequest(body) {
|
function gqlRequest(body, playerType) {
|
||||||
if (!GQLDeviceID) {
|
if (!GQLDeviceID) {
|
||||||
var dcharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
var dcharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
||||||
var dcharactersLength = dcharacters.length;
|
var dcharactersLength = dcharacters.length;
|
||||||
@@ -631,6 +632,12 @@
|
|||||||
...(ClientVersion && {'Client-Version': ClientVersion}),
|
...(ClientVersion && {'Client-Version': ClientVersion}),
|
||||||
...(ClientSession && {'Client-Session-Id': ClientSession})
|
...(ClientSession && {'Client-Session-Id': ClientSession})
|
||||||
};
|
};
|
||||||
|
if (playerType != 'site') {
|
||||||
|
headers = {
|
||||||
|
'Client-Id': ClientID,
|
||||||
|
'X-Device-Id': GQLDeviceID
|
||||||
|
};
|
||||||
|
}
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const requestId = Math.random().toString(36).substring(2, 15);
|
const requestId = Math.random().toString(36).substring(2, 15);
|
||||||
const fetchRequest = {
|
const fetchRequest = {
|
||||||
@@ -709,23 +716,36 @@
|
|||||||
const lsKeyQuality = 'video-quality';
|
const lsKeyQuality = 'video-quality';
|
||||||
const lsKeyMuted = 'video-muted';
|
const lsKeyMuted = 'video-muted';
|
||||||
const lsKeyVolume = 'volume';
|
const lsKeyVolume = 'volume';
|
||||||
var currentQualityLS = localStorage.getItem(lsKeyQuality);
|
var currentQualityLS = null;
|
||||||
var currentMutedLS = localStorage.getItem(lsKeyMuted);
|
var currentMutedLS = null;
|
||||||
var currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
var currentVolumeLS = null;
|
||||||
if (localStorageHookFailed && player?.core?.state) {
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
currentQualityLS = localStorage.getItem(lsKeyQuality);
|
||||||
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
currentMutedLS = localStorage.getItem(lsKeyMuted);
|
||||||
}
|
currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
||||||
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
if (localStorageHookFailed && player?.core?.state) {
|
||||||
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
||||||
}
|
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
||||||
|
}
|
||||||
|
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
||||||
|
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
||||||
player.play();
|
player.play();
|
||||||
if (localStorageHookFailed) {
|
if (localStorageHookFailed && (currentQualityLS || currentMutedLS || currentVolumeLS)) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
if (currentQualityLS) {
|
||||||
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
||||||
|
}
|
||||||
|
if (currentMutedLS) {
|
||||||
|
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
||||||
|
}
|
||||||
|
if (currentVolumeLS) {
|
||||||
|
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -783,7 +803,7 @@
|
|||||||
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
||||||
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
||||||
}
|
}
|
||||||
if (ForceAccessTokenPlayerType && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture')) {
|
if (ForceAccessTokenPlayerType && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture') && !init.body.includes('frontpage')) {
|
||||||
let replacedPlayerType = '';
|
let replacedPlayerType = '';
|
||||||
const newBody = JSON.parse(init.body);
|
const newBody = JSON.parse(init.body);
|
||||||
if (Array.isArray(newBody)) {
|
if (Array.isArray(newBody)) {
|
||||||
@@ -804,6 +824,22 @@
|
|||||||
init.body = JSON.stringify(newBody);
|
init.body = JSON.stringify(newBody);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (DisableMatureConentPopup) {
|
||||||
|
const newBody2 = JSON.parse(init.body);
|
||||||
|
if (Array.isArray(newBody2)) {
|
||||||
|
var hasRemovedClassification = false;
|
||||||
|
for (let i = 0; i < newBody2.length; i++) {
|
||||||
|
if (newBody2[i]?.operationName == 'ContentClassificationContext') {
|
||||||
|
hasRemovedClassification = true;
|
||||||
|
// Doesn't seem like it if we remove this element from the array so instead we duplicate another entry into this index. TODO: Find out why
|
||||||
|
newBody2[i] = newBody2[i == 0 && newBody2.length > 1 ? 1 : 0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (hasRemovedClassification) {
|
||||||
|
init.body = JSON.stringify(newBody2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return realFetch.apply(this, arguments);
|
return realFetch.apply(this, arguments);
|
||||||
@@ -867,34 +903,39 @@
|
|||||||
}
|
}
|
||||||
}catch{}
|
}catch{}
|
||||||
// Hooks for preserving volume / resolution
|
// Hooks for preserving volume / resolution
|
||||||
var keysToCache = [
|
try {
|
||||||
'video-quality',
|
var keysToCache = [
|
||||||
'video-muted',
|
'video-quality',
|
||||||
'volume',
|
'video-muted',
|
||||||
'lowLatencyModeEnabled',// Low Latency
|
'volume',
|
||||||
'persistenceEnabled',// Mini Player
|
'lowLatencyModeEnabled',// Low Latency
|
||||||
];
|
'persistenceEnabled',// Mini Player
|
||||||
var cachedValues = new Map();
|
];
|
||||||
for (var i = 0; i < keysToCache.length; i++) {
|
var cachedValues = new Map();
|
||||||
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
for (var i = 0; i < keysToCache.length; i++) {
|
||||||
}
|
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
||||||
var realSetItem = localStorage.setItem;
|
|
||||||
localStorage.setItem = function(key, value) {
|
|
||||||
if (cachedValues.has(key)) {
|
|
||||||
cachedValues.set(key, value);
|
|
||||||
}
|
}
|
||||||
realSetItem.apply(this, arguments);
|
var realSetItem = localStorage.setItem;
|
||||||
};
|
localStorage.setItem = function(key, value) {
|
||||||
var realGetItem = localStorage.getItem;
|
if (cachedValues.has(key)) {
|
||||||
localStorage.getItem = function(key) {
|
cachedValues.set(key, value);
|
||||||
if (cachedValues.has(key)) {
|
}
|
||||||
return cachedValues.get(key);
|
realSetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
var realGetItem = localStorage.getItem;
|
||||||
|
localStorage.getItem = function(key) {
|
||||||
|
if (cachedValues.has(key)) {
|
||||||
|
return cachedValues.get(key);
|
||||||
|
}
|
||||||
|
return realGetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
||||||
|
// These hooks are useful to preserve player state on player reload
|
||||||
|
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
||||||
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
return realGetItem.apply(this, arguments);
|
} catch (err) {
|
||||||
};
|
console.log('localStorageHooks failed ' + err)
|
||||||
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
|
||||||
// These hooks are useful to preserve player state on player reload
|
|
||||||
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
|
||||||
localStorageHookFailed = true;
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
twitch-videoad.js text/javascript
|
twitch-videoad.js text/javascript
|
||||||
(function() {
|
(function() {
|
||||||
if ( /(^|\.)twitch\.tv$/.test(document.location.hostname) === false ) { return; }
|
if ( /(^|\.)twitch\.tv$/.test(document.location.hostname) === false ) { return; }
|
||||||
var ourTwitchAdSolutionsVersion = 15;// Used to prevent conflicts with outdated versions of the scripts
|
var ourTwitchAdSolutionsVersion = 16;// Used to prevent conflicts with outdated versions of the scripts
|
||||||
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
||||||
console.log("skipping video-swap-new as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
console.log("skipping video-swap-new as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
||||||
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||||
@@ -13,6 +13,7 @@ twitch-videoad.js text/javascript
|
|||||||
scope.OPT_BACKUP_PLAYER_TYPES = [ 'autoplay', 'picture-by-picture', 'embed' ];
|
scope.OPT_BACKUP_PLAYER_TYPES = [ 'autoplay', 'picture-by-picture', 'embed' ];
|
||||||
scope.OPT_BACKUP_PLATFORM = 'android';
|
scope.OPT_BACKUP_PLATFORM = 'android';
|
||||||
scope.OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE = 'site';
|
scope.OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE = 'site';
|
||||||
|
scope.OPT_DISABLE_MATURE_CONTENT_POPUP = false;// If true this avoids having to log in to watch age gated content
|
||||||
scope.AD_SIGNIFIER = 'stitched-ad';
|
scope.AD_SIGNIFIER = 'stitched-ad';
|
||||||
scope.LIVE_SIGNIFIER = ',live';
|
scope.LIVE_SIGNIFIER = ',live';
|
||||||
scope.CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
|
scope.CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
|
||||||
@@ -275,12 +276,12 @@ twitch-videoad.js text/javascript
|
|||||||
var streamM3u8Response = await realFetch(streamM3u8Url);
|
var streamM3u8Response = await realFetch(streamM3u8Url);
|
||||||
if (streamM3u8Response.status === 200) {
|
if (streamM3u8Response.status === 200) {
|
||||||
var backTextStr = await streamM3u8Response.text();
|
var backTextStr = await streamM3u8Response.text();
|
||||||
if ((!backTextStr.includes(AD_SIGNIFIER) && (SimulatedAdsDepth == 0 || i >= SimulatedAdsDepth - 1)) || streamInfo.BackupEncodingsStatus.size >= playerTypes.length - 1) {
|
if ((!backTextStr.includes(AD_SIGNIFIER) && (SimulatedAdsDepth == 0 || i >= SimulatedAdsDepth - 1)) || i >= playerTypes.length - 1) {
|
||||||
result = backTextStr;
|
result = backTextStr;
|
||||||
backupPlayerTypeInfo = ' (' + playerType + ')';
|
backupPlayerTypeInfo = ' (' + playerType + ')';
|
||||||
streamInfo.BackupEncodingsStatus.set(playerType, 1);
|
streamInfo.BackupEncodingsStatus.set(playerType, 1);
|
||||||
streamInfo.BackupEncodingsPlayerTypeIndex = i;
|
streamInfo.BackupEncodingsPlayerTypeIndex = i;
|
||||||
if (playerType !== 'embed' && streamInfo.Encodings != null) {
|
if (streamInfo.Encodings != null) {
|
||||||
// Low resolution streams will reduce the number of resolutions in the UI. To fix this we merge the low res URLs into the main m3u8
|
// Low resolution streams will reduce the number of resolutions in the UI. To fix this we merge the low res URLs into the main m3u8
|
||||||
var normalEncodingsM3u8 = streamInfo.Encodings;
|
var normalEncodingsM3u8 = streamInfo.Encodings;
|
||||||
var normalLines = normalEncodingsM3u8.replace('\r', '').split('\n');
|
var normalLines = normalEncodingsM3u8.replace('\r', '').split('\n');
|
||||||
@@ -544,9 +545,9 @@ twitch-videoad.js text/javascript
|
|||||||
'playerType': playerType
|
'playerType': playerType
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return gqlRequest(body);
|
return gqlRequest(body, playerType);
|
||||||
}
|
}
|
||||||
function gqlRequest(body) {
|
function gqlRequest(body, playerType) {
|
||||||
if (!gql_device_id) {
|
if (!gql_device_id) {
|
||||||
const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
||||||
for (let i = 0; i < 32; i += 1) {
|
for (let i = 0; i < 32; i += 1) {
|
||||||
@@ -560,6 +561,12 @@ twitch-videoad.js text/javascript
|
|||||||
'Authorization': AuthorizationHeader,
|
'Authorization': AuthorizationHeader,
|
||||||
...(ClientIntegrityHeader && {'Client-Integrity': ClientIntegrityHeader})
|
...(ClientIntegrityHeader && {'Client-Integrity': ClientIntegrityHeader})
|
||||||
};
|
};
|
||||||
|
if (playerType != 'site') {
|
||||||
|
headers = {
|
||||||
|
'Client-Id': CLIENT_ID,
|
||||||
|
'X-Device-Id': gql_device_id
|
||||||
|
};
|
||||||
|
}
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const requestId = Math.random().toString(36).substring(2, 15);
|
const requestId = Math.random().toString(36).substring(2, 15);
|
||||||
const fetchRequest = {
|
const fetchRequest = {
|
||||||
@@ -637,7 +644,7 @@ twitch-videoad.js text/javascript
|
|||||||
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
||||||
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
||||||
}
|
}
|
||||||
if (OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture')) {
|
if (OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture') && !init.body.includes('frontpage')) {
|
||||||
let replacedPlayerType = '';
|
let replacedPlayerType = '';
|
||||||
const newBody = JSON.parse(init.body);
|
const newBody = JSON.parse(init.body);
|
||||||
if (Array.isArray(newBody)) {
|
if (Array.isArray(newBody)) {
|
||||||
@@ -658,6 +665,22 @@ twitch-videoad.js text/javascript
|
|||||||
init.body = JSON.stringify(newBody);
|
init.body = JSON.stringify(newBody);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (OPT_DISABLE_MATURE_CONTENT_POPUP) {
|
||||||
|
const newBody2 = JSON.parse(init.body);
|
||||||
|
if (Array.isArray(newBody2)) {
|
||||||
|
var hasRemovedClassification = false;
|
||||||
|
for (let i = 0; i < newBody2.length; i++) {
|
||||||
|
if (newBody2[i]?.operationName == 'ContentClassificationContext') {
|
||||||
|
hasRemovedClassification = true;
|
||||||
|
// Doesn't seem like it if we remove this element from the array so instead we duplicate another entry into this index. TODO: Find out why
|
||||||
|
newBody2[i] = newBody2[i == 0 && newBody2.length > 1 ? 1 : 0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (hasRemovedClassification) {
|
||||||
|
init.body = JSON.stringify(newBody2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return realFetch.apply(this, arguments);
|
return realFetch.apply(this, arguments);
|
||||||
@@ -729,23 +752,36 @@ twitch-videoad.js text/javascript
|
|||||||
const lsKeyQuality = 'video-quality';
|
const lsKeyQuality = 'video-quality';
|
||||||
const lsKeyMuted = 'video-muted';
|
const lsKeyMuted = 'video-muted';
|
||||||
const lsKeyVolume = 'volume';
|
const lsKeyVolume = 'volume';
|
||||||
var currentQualityLS = localStorage.getItem(lsKeyQuality);
|
var currentQualityLS = null;
|
||||||
var currentMutedLS = localStorage.getItem(lsKeyMuted);
|
var currentMutedLS = null;
|
||||||
var currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
var currentVolumeLS = null;
|
||||||
if (localStorageHookFailed && player?.core?.state) {
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
currentQualityLS = localStorage.getItem(lsKeyQuality);
|
||||||
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
currentMutedLS = localStorage.getItem(lsKeyMuted);
|
||||||
}
|
currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
||||||
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
if (localStorageHookFailed && player?.core?.state) {
|
||||||
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
||||||
}
|
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
||||||
|
}
|
||||||
|
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
||||||
|
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
||||||
player.play();
|
player.play();
|
||||||
if (localStorageHookFailed) {
|
if (localStorageHookFailed && (currentQualityLS || currentMutedLS || currentVolumeLS)) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
if (currentQualityLS) {
|
||||||
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
||||||
|
}
|
||||||
|
if (currentMutedLS) {
|
||||||
|
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
||||||
|
}
|
||||||
|
if (currentVolumeLS) {
|
||||||
|
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -807,34 +843,39 @@ twitch-videoad.js text/javascript
|
|||||||
}
|
}
|
||||||
}catch{}
|
}catch{}
|
||||||
// Hooks for preserving volume / resolution
|
// Hooks for preserving volume / resolution
|
||||||
var keysToCache = [
|
try {
|
||||||
'video-quality',
|
var keysToCache = [
|
||||||
'video-muted',
|
'video-quality',
|
||||||
'volume',
|
'video-muted',
|
||||||
'lowLatencyModeEnabled',// Low Latency
|
'volume',
|
||||||
'persistenceEnabled',// Mini Player
|
'lowLatencyModeEnabled',// Low Latency
|
||||||
];
|
'persistenceEnabled',// Mini Player
|
||||||
var cachedValues = new Map();
|
];
|
||||||
for (var i = 0; i < keysToCache.length; i++) {
|
var cachedValues = new Map();
|
||||||
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
for (var i = 0; i < keysToCache.length; i++) {
|
||||||
}
|
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
||||||
var realSetItem = localStorage.setItem;
|
|
||||||
localStorage.setItem = function(key, value) {
|
|
||||||
if (cachedValues.has(key)) {
|
|
||||||
cachedValues.set(key, value);
|
|
||||||
}
|
}
|
||||||
realSetItem.apply(this, arguments);
|
var realSetItem = localStorage.setItem;
|
||||||
};
|
localStorage.setItem = function(key, value) {
|
||||||
var realGetItem = localStorage.getItem;
|
if (cachedValues.has(key)) {
|
||||||
localStorage.getItem = function(key) {
|
cachedValues.set(key, value);
|
||||||
if (cachedValues.has(key)) {
|
}
|
||||||
return cachedValues.get(key);
|
realSetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
var realGetItem = localStorage.getItem;
|
||||||
|
localStorage.getItem = function(key) {
|
||||||
|
if (cachedValues.has(key)) {
|
||||||
|
return cachedValues.get(key);
|
||||||
|
}
|
||||||
|
return realGetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
||||||
|
// These hooks are useful to preserve player state on player reload
|
||||||
|
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
||||||
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
return realGetItem.apply(this, arguments);
|
} catch (err) {
|
||||||
};
|
console.log('localStorageHooks failed ' + err)
|
||||||
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
|
||||||
// These hooks are useful to preserve player state on player reload
|
|
||||||
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
|
||||||
localStorageHookFailed = true;
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name TwitchAdSolutions (video-swap-new)
|
// @name TwitchAdSolutions (video-swap-new)
|
||||||
// @namespace https://github.com/pixeltris/TwitchAdSolutions
|
// @namespace https://github.com/pixeltris/TwitchAdSolutions
|
||||||
// @version 1.47
|
// @version 1.48
|
||||||
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js
|
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js
|
||||||
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js
|
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js
|
||||||
// @description Multiple solutions for blocking Twitch ads (video-swap-new)
|
// @description Multiple solutions for blocking Twitch ads (video-swap-new)
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
// ==/UserScript==
|
// ==/UserScript==
|
||||||
(function() {
|
(function() {
|
||||||
'use strict';
|
'use strict';
|
||||||
var ourTwitchAdSolutionsVersion = 15;// Used to prevent conflicts with outdated versions of the scripts
|
var ourTwitchAdSolutionsVersion = 16;// Used to prevent conflicts with outdated versions of the scripts
|
||||||
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
||||||
console.log("skipping video-swap-new as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
console.log("skipping video-swap-new as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
||||||
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||||
@@ -25,6 +25,7 @@
|
|||||||
scope.OPT_BACKUP_PLAYER_TYPES = [ 'autoplay', 'picture-by-picture', 'embed' ];
|
scope.OPT_BACKUP_PLAYER_TYPES = [ 'autoplay', 'picture-by-picture', 'embed' ];
|
||||||
scope.OPT_BACKUP_PLATFORM = 'android';
|
scope.OPT_BACKUP_PLATFORM = 'android';
|
||||||
scope.OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE = 'site';
|
scope.OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE = 'site';
|
||||||
|
scope.OPT_DISABLE_MATURE_CONTENT_POPUP = false;// If true this avoids having to log in to watch age gated content
|
||||||
scope.AD_SIGNIFIER = 'stitched-ad';
|
scope.AD_SIGNIFIER = 'stitched-ad';
|
||||||
scope.LIVE_SIGNIFIER = ',live';
|
scope.LIVE_SIGNIFIER = ',live';
|
||||||
scope.CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
|
scope.CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
|
||||||
@@ -287,12 +288,12 @@
|
|||||||
var streamM3u8Response = await realFetch(streamM3u8Url);
|
var streamM3u8Response = await realFetch(streamM3u8Url);
|
||||||
if (streamM3u8Response.status === 200) {
|
if (streamM3u8Response.status === 200) {
|
||||||
var backTextStr = await streamM3u8Response.text();
|
var backTextStr = await streamM3u8Response.text();
|
||||||
if ((!backTextStr.includes(AD_SIGNIFIER) && (SimulatedAdsDepth == 0 || i >= SimulatedAdsDepth - 1)) || streamInfo.BackupEncodingsStatus.size >= playerTypes.length - 1) {
|
if ((!backTextStr.includes(AD_SIGNIFIER) && (SimulatedAdsDepth == 0 || i >= SimulatedAdsDepth - 1)) || i >= playerTypes.length - 1) {
|
||||||
result = backTextStr;
|
result = backTextStr;
|
||||||
backupPlayerTypeInfo = ' (' + playerType + ')';
|
backupPlayerTypeInfo = ' (' + playerType + ')';
|
||||||
streamInfo.BackupEncodingsStatus.set(playerType, 1);
|
streamInfo.BackupEncodingsStatus.set(playerType, 1);
|
||||||
streamInfo.BackupEncodingsPlayerTypeIndex = i;
|
streamInfo.BackupEncodingsPlayerTypeIndex = i;
|
||||||
if (playerType !== 'embed' && streamInfo.Encodings != null) {
|
if (streamInfo.Encodings != null) {
|
||||||
// Low resolution streams will reduce the number of resolutions in the UI. To fix this we merge the low res URLs into the main m3u8
|
// Low resolution streams will reduce the number of resolutions in the UI. To fix this we merge the low res URLs into the main m3u8
|
||||||
var normalEncodingsM3u8 = streamInfo.Encodings;
|
var normalEncodingsM3u8 = streamInfo.Encodings;
|
||||||
var normalLines = normalEncodingsM3u8.replace('\r', '').split('\n');
|
var normalLines = normalEncodingsM3u8.replace('\r', '').split('\n');
|
||||||
@@ -556,9 +557,9 @@
|
|||||||
'playerType': playerType
|
'playerType': playerType
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return gqlRequest(body);
|
return gqlRequest(body, playerType);
|
||||||
}
|
}
|
||||||
function gqlRequest(body) {
|
function gqlRequest(body, playerType) {
|
||||||
if (!gql_device_id) {
|
if (!gql_device_id) {
|
||||||
const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
||||||
for (let i = 0; i < 32; i += 1) {
|
for (let i = 0; i < 32; i += 1) {
|
||||||
@@ -572,6 +573,12 @@
|
|||||||
'Authorization': AuthorizationHeader,
|
'Authorization': AuthorizationHeader,
|
||||||
...(ClientIntegrityHeader && {'Client-Integrity': ClientIntegrityHeader})
|
...(ClientIntegrityHeader && {'Client-Integrity': ClientIntegrityHeader})
|
||||||
};
|
};
|
||||||
|
if (playerType != 'site') {
|
||||||
|
headers = {
|
||||||
|
'Client-Id': CLIENT_ID,
|
||||||
|
'X-Device-Id': gql_device_id
|
||||||
|
};
|
||||||
|
}
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const requestId = Math.random().toString(36).substring(2, 15);
|
const requestId = Math.random().toString(36).substring(2, 15);
|
||||||
const fetchRequest = {
|
const fetchRequest = {
|
||||||
@@ -649,7 +656,7 @@
|
|||||||
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
|
||||||
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
|
||||||
}
|
}
|
||||||
if (OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture')) {
|
if (OPT_FORCE_ACCESS_TOKEN_PLAYER_TYPE && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && !init.body.includes('picture-by-picture') && !init.body.includes('frontpage')) {
|
||||||
let replacedPlayerType = '';
|
let replacedPlayerType = '';
|
||||||
const newBody = JSON.parse(init.body);
|
const newBody = JSON.parse(init.body);
|
||||||
if (Array.isArray(newBody)) {
|
if (Array.isArray(newBody)) {
|
||||||
@@ -670,6 +677,22 @@
|
|||||||
init.body = JSON.stringify(newBody);
|
init.body = JSON.stringify(newBody);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (OPT_DISABLE_MATURE_CONTENT_POPUP) {
|
||||||
|
const newBody2 = JSON.parse(init.body);
|
||||||
|
if (Array.isArray(newBody2)) {
|
||||||
|
var hasRemovedClassification = false;
|
||||||
|
for (let i = 0; i < newBody2.length; i++) {
|
||||||
|
if (newBody2[i]?.operationName == 'ContentClassificationContext') {
|
||||||
|
hasRemovedClassification = true;
|
||||||
|
// Doesn't seem like it if we remove this element from the array so instead we duplicate another entry into this index. TODO: Find out why
|
||||||
|
newBody2[i] = newBody2[i == 0 && newBody2.length > 1 ? 1 : 0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (hasRemovedClassification) {
|
||||||
|
init.body = JSON.stringify(newBody2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return realFetch.apply(this, arguments);
|
return realFetch.apply(this, arguments);
|
||||||
@@ -741,23 +764,36 @@
|
|||||||
const lsKeyQuality = 'video-quality';
|
const lsKeyQuality = 'video-quality';
|
||||||
const lsKeyMuted = 'video-muted';
|
const lsKeyMuted = 'video-muted';
|
||||||
const lsKeyVolume = 'volume';
|
const lsKeyVolume = 'volume';
|
||||||
var currentQualityLS = localStorage.getItem(lsKeyQuality);
|
var currentQualityLS = null;
|
||||||
var currentMutedLS = localStorage.getItem(lsKeyMuted);
|
var currentMutedLS = null;
|
||||||
var currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
var currentVolumeLS = null;
|
||||||
if (localStorageHookFailed && player?.core?.state) {
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
currentQualityLS = localStorage.getItem(lsKeyQuality);
|
||||||
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
currentMutedLS = localStorage.getItem(lsKeyMuted);
|
||||||
}
|
currentVolumeLS = localStorage.getItem(lsKeyVolume);
|
||||||
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
if (localStorageHookFailed && player?.core?.state) {
|
||||||
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
|
||||||
}
|
localStorage.setItem(lsKeyVolume, player.core.state.volume);
|
||||||
|
}
|
||||||
|
if (localStorageHookFailed && player?.core?.state?.quality?.group) {
|
||||||
|
localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
|
||||||
player.play();
|
player.play();
|
||||||
if (localStorageHookFailed) {
|
if (localStorageHookFailed && (currentQualityLS || currentMutedLS || currentVolumeLS)) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
try {
|
||||||
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
if (currentQualityLS) {
|
||||||
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
localStorage.setItem(lsKeyQuality, currentQualityLS);
|
||||||
|
}
|
||||||
|
if (currentMutedLS) {
|
||||||
|
localStorage.setItem(lsKeyMuted, currentMutedLS);
|
||||||
|
}
|
||||||
|
if (currentVolumeLS) {
|
||||||
|
localStorage.setItem(lsKeyVolume, currentVolumeLS);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -819,34 +855,39 @@
|
|||||||
}
|
}
|
||||||
}catch{}
|
}catch{}
|
||||||
// Hooks for preserving volume / resolution
|
// Hooks for preserving volume / resolution
|
||||||
var keysToCache = [
|
try {
|
||||||
'video-quality',
|
var keysToCache = [
|
||||||
'video-muted',
|
'video-quality',
|
||||||
'volume',
|
'video-muted',
|
||||||
'lowLatencyModeEnabled',// Low Latency
|
'volume',
|
||||||
'persistenceEnabled',// Mini Player
|
'lowLatencyModeEnabled',// Low Latency
|
||||||
];
|
'persistenceEnabled',// Mini Player
|
||||||
var cachedValues = new Map();
|
];
|
||||||
for (var i = 0; i < keysToCache.length; i++) {
|
var cachedValues = new Map();
|
||||||
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
for (var i = 0; i < keysToCache.length; i++) {
|
||||||
}
|
cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
|
||||||
var realSetItem = localStorage.setItem;
|
|
||||||
localStorage.setItem = function(key, value) {
|
|
||||||
if (cachedValues.has(key)) {
|
|
||||||
cachedValues.set(key, value);
|
|
||||||
}
|
}
|
||||||
realSetItem.apply(this, arguments);
|
var realSetItem = localStorage.setItem;
|
||||||
};
|
localStorage.setItem = function(key, value) {
|
||||||
var realGetItem = localStorage.getItem;
|
if (cachedValues.has(key)) {
|
||||||
localStorage.getItem = function(key) {
|
cachedValues.set(key, value);
|
||||||
if (cachedValues.has(key)) {
|
}
|
||||||
return cachedValues.get(key);
|
realSetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
var realGetItem = localStorage.getItem;
|
||||||
|
localStorage.getItem = function(key) {
|
||||||
|
if (cachedValues.has(key)) {
|
||||||
|
return cachedValues.get(key);
|
||||||
|
}
|
||||||
|
return realGetItem.apply(this, arguments);
|
||||||
|
};
|
||||||
|
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
||||||
|
// These hooks are useful to preserve player state on player reload
|
||||||
|
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
||||||
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
return realGetItem.apply(this, arguments);
|
} catch (err) {
|
||||||
};
|
console.log('localStorageHooks failed ' + err)
|
||||||
if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
|
|
||||||
// These hooks are useful to preserve player state on player reload
|
|
||||||
// Firefox doesn't allow hooking of localStorage functions but chrome does
|
|
||||||
localStorageHookFailed = true;
|
localStorageHookFailed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user