diff --git a/README.md b/README.md index cf89b18cc..fefc76df8 100644 --- a/README.md +++ b/README.md @@ -140,8 +140,8 @@ $ ./fern.js pack configs/ghostery.js + Firefox: 52+ + Firefox Android: 55+ -+ Chrome: 49+ -+ Opera: 36+ ++ Chrome: 58+ ++ Opera: 45+ + Edge: 34.14291+ ## Contribute diff --git a/manifest.json b/manifest.json index cdf5d827b..48da9a9c3 100644 --- a/manifest.json +++ b/manifest.json @@ -9,8 +9,8 @@ "author": "Ghostery", "name": "__MSG_name__", "short_name": "Ghostery", - "version": "8.2.4", - "version_name": "8.2.4", + "version": "8.3.0", + "version_name": "8.3.0", "default_locale": "en", "description": "__MSG_short_description__", "debug": true, @@ -79,6 +79,8 @@ "tabs", "http://*/*", "https://*/*", + "ws://*/*", + "wss://*/*", "storage" ], "background": { @@ -88,8 +90,8 @@ "persistent": true }, "minimum_edge_version": "33.14281.1000.0", - "minimum_chrome_version": "49", - "minimum_opera_version": "36", + "minimum_chrome_version": "58", + "minimum_opera_version": "45", "web_accessible_resources": [ "app/images/*", "dist/css/rewards_styles.css" diff --git a/src/background.js b/src/background.js index 53c56b7e3..dfe730df2 100644 --- a/src/background.js +++ b/src/background.js @@ -1419,12 +1419,18 @@ function initializePopup() { * @memberOf Background */ function addCommonGhosteryAndAntitrackingListeners() { - chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, { - urls: ['http://*/*', 'https://*/*'] - }, ['blocking']); - chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, { - urls: ['http://*/*', 'https://*/*'] - }, ['responseHeaders']); + 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: urlFilters }, ['blocking']); + chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, { urls: urlFilters }, ['responseHeaders']); } /**