Fix GQL requests failing under Brave (userscript) #392
Also moved back to old player type #387
This commit is contained in:
pixeltris
+90
-31
@@ -1,7 +1,7 @@
|
||||
// ==UserScript==
|
||||
// @name TwitchAdSolutions (vaft)
|
||||
// @namespace https://github.com/pixeltris/TwitchAdSolutions
|
||||
// @version 20.0.0
|
||||
// @version 21.0.0
|
||||
// @description Multiple solutions for blocking Twitch ads (vaft)
|
||||
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
|
||||
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
|
||||
@@ -9,17 +9,21 @@
|
||||
// @match *://*.twitch.tv/*
|
||||
// @run-at document-start
|
||||
// @inject-into page
|
||||
// @grant none
|
||||
// @grant GM.xmlHttpRequest
|
||||
// @connect gql.twitch.tv
|
||||
// ==/UserScript==
|
||||
(function() {
|
||||
'use strict';
|
||||
var ourTwitchAdSolutionsVersion = 5;// Only bump this when there's a breaking change to Twitch, the script, or there's a conflict with an unmaintained extension which uses this script
|
||||
if (window.twitchAdSolutionsVersion && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
||||
console.log("skipping vaft as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
|
||||
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||
var ourTwitchAdSolutionsVersion = 6;// Only bump this when there's a breaking change to Twitch, the script, or there's a conflict with an unmaintained extension which uses this script
|
||||
if (typeof unsafeWindow === 'undefined') {
|
||||
unsafeWindow = window;
|
||||
}
|
||||
if (typeof unsafeWindow.twitchAdSolutionsVersion !== 'undefined' && unsafeWindow.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
|
||||
console.log("skipping vaft as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + unsafeWindow.twitchAdSolutionsVersion);
|
||||
unsafeWindow.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||
return;
|
||||
}
|
||||
window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||
unsafeWindow.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
|
||||
function declareOptions(scope) {
|
||||
scope.AdSignifier = 'stitched';
|
||||
scope.ClientID = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
|
||||
@@ -27,7 +31,7 @@
|
||||
scope.ClientSession = 'null';
|
||||
scope.PlayerType2 = 'embed'; //Source
|
||||
scope.PlayerType3 = 'site'; //Source
|
||||
scope.PlayerType4 = 'picture-by-picture'; //360p
|
||||
scope.PlayerType4 = 'autoplay'; //360p
|
||||
scope.CurrentChannelName = null;
|
||||
scope.UsherParams = null;
|
||||
scope.WasShowingAd = false;
|
||||
@@ -102,8 +106,8 @@
|
||||
|| workerStringReinsert.some((x) => workerString.includes(x));
|
||||
}
|
||||
function hookWindowWorker() {
|
||||
var reinsert = getWorkersForReinsert(window.Worker);
|
||||
var newWorker = class Worker extends getCleanWorker(window.Worker) {
|
||||
var reinsert = getWorkersForReinsert(unsafeWindow.Worker);
|
||||
var newWorker = class Worker extends getCleanWorker(unsafeWindow.Worker) {
|
||||
constructor(twitchBlobUrl, options) {
|
||||
var isTwitchWorker = false;
|
||||
try {
|
||||
@@ -254,10 +258,10 @@
|
||||
qualityToSelect = 0;
|
||||
}
|
||||
}
|
||||
var currentQualityLS = window.localStorage.getItem('video-quality');
|
||||
var currentQualityLS = unsafeWindow.localStorage.getItem('video-quality');
|
||||
lowQuality[qualityToSelect].click();
|
||||
settingsCog.click();
|
||||
window.localStorage.setItem('video-quality', currentQualityLS);
|
||||
unsafeWindow.localStorage.setItem('video-quality', currentQualityLS);
|
||||
if (e.data.value != null) {
|
||||
OriginalVideoPlayerQuality = null;
|
||||
IsPlayerAutoQuality = null;
|
||||
@@ -304,7 +308,7 @@
|
||||
}
|
||||
};
|
||||
var workerInstance = reinsertWorkers(newWorker, reinsert);
|
||||
Object.defineProperty(window, 'Worker', {
|
||||
Object.defineProperty(unsafeWindow, 'Worker', {
|
||||
get: function() {
|
||||
return workerInstance;
|
||||
},
|
||||
@@ -848,26 +852,81 @@
|
||||
} catch (err) {}
|
||||
} catch (err) {}
|
||||
}
|
||||
window.reloadTwitchPlayer = doTwitchPlayerTask;
|
||||
unsafeWindow.reloadTwitchPlayer = doTwitchPlayerTask;
|
||||
var localDeviceID = null;
|
||||
localDeviceID = window.localStorage.getItem('local_copy_unique_id');
|
||||
localDeviceID = unsafeWindow.localStorage.getItem('local_copy_unique_id');
|
||||
function postTwitchWorkerMessage(key, value) {
|
||||
twitchWorkers.forEach((worker) => {
|
||||
worker.postMessage({key: key, value: value});
|
||||
});
|
||||
}
|
||||
function makeGmXmlHttpRequest(fetchRequest) {
|
||||
return new Promise((resolve, reject) => {
|
||||
GM.xmlHttpRequest({
|
||||
method: fetchRequest.options.method,
|
||||
url: fetchRequest.url,
|
||||
data: fetchRequest.options.body,
|
||||
headers: fetchRequest.options.headers,
|
||||
onload: response => resolve(response),
|
||||
onerror: error => reject(error)
|
||||
});
|
||||
});
|
||||
}
|
||||
// Taken from https://github.com/dimdenGD/YeahTwitter/blob/9e0520f5abe029f57929795d8de0d2e5d3751cf3/us.js#L48
|
||||
function parseHeaders(headersString) {
|
||||
const headers = new Headers();
|
||||
const lines = headersString.trim().split(/[\r\n]+/);
|
||||
lines.forEach(line => {
|
||||
const parts = line.split(':');
|
||||
const header = parts.shift();
|
||||
const value = parts.join(':');
|
||||
headers.append(header, value);
|
||||
});
|
||||
return headers;
|
||||
}
|
||||
var serverLikesThisBrowser = false;
|
||||
var serverHatesThisBrowser = false;
|
||||
async function handleWorkerFetchRequest(fetchRequest) {
|
||||
try {
|
||||
const response = await window.realFetch(fetchRequest.url, fetchRequest.options);
|
||||
const responseBody = await response.text();
|
||||
const responseObject = {
|
||||
id: fetchRequest.id,
|
||||
status: response.status,
|
||||
statusText: response.statusText,
|
||||
headers: Object.fromEntries(response.headers.entries()),
|
||||
body: responseBody
|
||||
};
|
||||
return responseObject;
|
||||
if (serverLikesThisBrowser || !serverHatesThisBrowser) {
|
||||
const response = await unsafeWindow.realFetch(fetchRequest.url, fetchRequest.options);
|
||||
const responseBody = await response.text();
|
||||
const responseObject = {
|
||||
id: fetchRequest.id,
|
||||
status: response.status,
|
||||
statusText: response.statusText,
|
||||
headers: Object.fromEntries(response.headers.entries()),
|
||||
body: responseBody
|
||||
};
|
||||
if (responseObject.status === 200) {
|
||||
var resp = JSON.parse(responseBody);
|
||||
if (typeof resp.errors !== 'undefined') {
|
||||
serverHatesThisBrowser = true;
|
||||
} else {
|
||||
serverLikesThisBrowser = true;
|
||||
}
|
||||
}
|
||||
if (serverLikesThisBrowser || !serverHatesThisBrowser) {
|
||||
return responseObject;
|
||||
}
|
||||
}
|
||||
if (typeof GM !== 'undefined' && typeof GM.xmlHttpRequest !== 'undefined') {
|
||||
fetchRequest.options.headers['User-Agent'] = 'Mozilla/5.0 (X11; Linux i686; rv:140.0) Gecko/20100101 Firefox/140.0';
|
||||
fetchRequest.options.headers['Referer'] = 'https://www.twitch.tv/';
|
||||
fetchRequest.options.headers['Origin'] = 'https://www.twitch.tv/';
|
||||
fetchRequest.options.headers['Host'] = 'gql.twitch.tv';
|
||||
const response = await makeGmXmlHttpRequest(fetchRequest);
|
||||
const responseBody = response.responseText;
|
||||
const responseObject = {
|
||||
id: fetchRequest.id,
|
||||
status: response.status,
|
||||
statusText: response.statusText,
|
||||
headers: Object.fromEntries(parseHeaders(response.responseHeaders).entries()),
|
||||
body: responseBody
|
||||
};
|
||||
return responseObject;
|
||||
}
|
||||
throw { message: 'Failed to resolve GQL request. Try the userscript version of the ad blocking solution' };
|
||||
} catch (error) {
|
||||
return {
|
||||
id: fetchRequest.id,
|
||||
@@ -876,12 +935,12 @@
|
||||
}
|
||||
}
|
||||
function hookFetch() {
|
||||
var realFetch = window.fetch;
|
||||
window.realFetch = realFetch;
|
||||
window.fetch = function(url, init, ...args) {
|
||||
var realFetch = unsafeWindow.fetch;
|
||||
unsafeWindow.realFetch = realFetch;
|
||||
unsafeWindow.fetch = function(url, init, ...args) {
|
||||
if (typeof url === 'string') {
|
||||
//Check if squad stream.
|
||||
if (window.location.pathname.includes('/squad')) {
|
||||
if (unsafeWindow.location.pathname.includes('/squad')) {
|
||||
postTwitchWorkerMessage('UpdateIsSquadStream', true);
|
||||
} else {
|
||||
postTwitchWorkerMessage('UpdateIsSquadStream', false);
|
||||
@@ -1004,13 +1063,13 @@
|
||||
}
|
||||
}catch{}
|
||||
}
|
||||
declareOptions(window);
|
||||
declareOptions(unsafeWindow);
|
||||
hookWindowWorker();
|
||||
hookFetch();
|
||||
if (document.readyState === "complete" || document.readyState === "loaded" || document.readyState === "interactive") {
|
||||
onContentLoaded();
|
||||
} else {
|
||||
window.addEventListener("DOMContentLoaded", function() {
|
||||
unsafeWindow.addEventListener("DOMContentLoaded", function() {
|
||||
onContentLoaded();
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user