Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

GH-1429 Add WebSockets and bump mininum version numbers #234

Merged
merged 10 commits into from Nov 6, 2018

Minor refactor.

  • Loading branch information
jsignanini committed Nov 6, 2018
commit d926472d88377f51541b999f327519edf0bd3655
@@ -1419,15 +1419,18 @@ function initializePopup() {
* @memberOf Background
*/
function addCommonGhosteryAndAntitrackingListeners() {
// Edge doesn't support WebSockets
const urls = ['http://*/*', 'https://*/*'];
if (!IS_EDGE) {
urls.push('ws://*/*', 'wss://*/*');
let urlFilters = ['http://*/*', 'https://*/*', 'ws://*/*', 'wss://*/*'];
if (IS_EDGE) {
// Edge doesn't support WebSockets
urlFilters = urlFilters.reduce((accumulator, currentValue) => {
if (!currentValue.match(/^wss?:\/\//)) {
accumulator.push(currentValue);
}
return accumulator;
}, []);
}
chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, { urls }, ['blocking']);
chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {
urls: ['http://*/*', 'https://*/*']
}, ['responseHeaders']);
chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, { urls: urlFilters }, ['blocking']);
chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, { urls: urlFilters }, ['responseHeaders']);
}

/**
ProTip! Use n and p to navigate between commits in a pull request.