| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 /* | |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | |
| 3 * Copyright (C) 2006-2016 Eyeo GmbH | |
| 4 * | |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | |
| 6 * it under the terms of the GNU General Public License version 3 as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 * GNU General Public License for more details. | |
| 13 * | |
| 14 * You should have received a copy of the GNU General Public License | |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | |
| 16 */ | |
| 17 | |
| 18 /** @module contentBlocking */ | |
| 19 | |
| 20 "use strict"; | |
| 21 | |
| 22 let {Prefs} = require("prefs"); | |
| 23 let {ContentBlockerList} = require("abp2blocklist"); | |
| 24 let {FilterStorage} = require("filterStorage"); | |
| 25 let {FilterNotifier} = require("filterNotifier"); | |
| 26 let {port} = require("messaging"); | |
| 27 | |
| 28 let contentBlockingSupported = "setContentBlocker" in safari.extension; | |
| 29 let legacyAPISupported = new Promise(resolve => | |
| 30 { | |
| 31 function onLegacyAPISupported(msg, sender) | |
| 32 { | |
| 33 port.off("safari.legacyAPISupported", onLegacyAPISupported); | |
| 34 resolve(msg.legacyAPISupported); | |
| 35 } | |
| 36 port.on("safari.legacyAPISupported", onLegacyAPISupported); | |
| 37 }); | |
| 38 let contentBlockingActive = false; | |
| 39 let afterContentBlockingFinished = null; | |
| 40 let contentBlockListDirty = true; | |
| 41 let lastSetContentBlockerResult; | |
| 42 | |
| 43 function clearBlockCounters() | |
| 44 { | |
| 45 ext.pages.query({}, pages => | |
| 46 { | |
| 47 for (let page of pages) | |
| 48 page.browserAction.setBadge(); | |
| 49 }); | |
| 50 } | |
| 51 | |
| 52 function setContentBlocker(callback) | |
| 53 { | |
| 54 // setContentBlocker returns null if given the same blocklist as last time, | |
| 55 // even when there was an error. (It's also wasteful to re-generate the | |
| 56 // blocklist when nothing has changed!) | |
| 57 if (!contentBlockListDirty) | |
| 58 { | |
| 59 callback(lastSetContentBlockerResult); | |
| 60 return; | |
| 61 } | |
| 62 | |
| 63 let contentBlockerList = new ContentBlockerList(); | |
| 64 for (let subscription of FilterStorage.subscriptions) | |
| 65 if (!subscription.disabled) | |
| 66 for (let filter of subscription.filters) | |
| 67 contentBlockerList.addFilter(filter); | |
| 68 | |
| 69 contentBlockListDirty = false; | |
| 70 safari.extension.setContentBlocker( | |
| 71 // setContentBlocker seems to not work in Safari 9 when a callback is passed | |
| 72 // unless the rules are converted to JSON first. (An error is thrown: | |
| 73 // "Extension compilation failed: Failed to parse the JSON String.") | |
| 74 // Bug #26322821 filed on bugreport.apple.com | |
| 75 JSON.stringify(contentBlockerList.generateRules()), | |
| 76 function (result) | |
|
Sebastian Noack
2016/05/17 18:35:25
Nit: We usually don't put a space before the argum
Sebastian Noack
2016/05/17 18:35:25
Nit: I think this variable should be called "error
kzar
2016/05/17 19:20:22
Done.
kzar
2016/05/17 19:20:22
Done.
| |
| 77 { | |
| 78 // Safari 9 performs the callback twice under some conditions, first with | |
|
kzar
2016/05/17 17:13:06
As far as I can tell the behaviour of the callback
Sebastian Noack
2016/05/17 18:35:25
Well, if future versions of Safari won't have that
kzar
2016/05/17 19:20:22
Acknowledged.
| |
| 79 // an empty string and then with an Error! | |
| 80 if (result == "") | |
| 81 return; | |
| 82 | |
| 83 lastSetContentBlockerResult = result; | |
| 84 callback(result); | |
| 85 } | |
| 86 ); | |
| 87 } | |
| 88 | |
| 89 function updateContentBlocker(isStartup, legacyAPISupported) | |
| 90 { | |
| 91 afterContentBlockingFinished = new Promise(resolve => | |
| 92 { | |
| 93 setContentBlocker(result => | |
| 94 { | |
| 95 if (result instanceof Error) | |
| 96 { | |
| 97 let suppressErrorMessage = false; | |
| 98 | |
| 99 // If the content blocking API fails the first time it's used the | |
| 100 // legacy blocking API (if available) won't have been disabled. | |
| 101 if (!contentBlockingActive && legacyAPISupported) | |
| 102 { | |
| 103 Prefs.safariContentBlocker = false; | |
| 104 // If content blocking failed on startup and we're switching back to | |
| 105 // the legacy API anyway we don't need to show an error message. | |
| 106 if (isStartup) | |
| 107 suppressErrorMessage = true; | |
| 108 } | |
| 109 | |
| 110 if (!suppressErrorMessage) | |
| 111 alert(result.message); | |
| 112 } | |
| 113 else if (!contentBlockingActive) | |
| 114 { | |
| 115 contentBlockingActive = true; | |
| 116 clearBlockCounters(); | |
| 117 } | |
| 118 | |
| 119 resolve(contentBlockingActive); | |
| 120 afterContentBlockingFinished = null; | |
| 121 }); | |
| 122 }); | |
| 123 } | |
| 124 | |
| 125 if (contentBlockingSupported) | |
| 126 { | |
| 127 Promise.all([Prefs.untilLoaded, | |
| 128 FilterNotifier.once("load"), | |
| 129 legacyAPISupported]).then(resolvedValues => | |
| 130 { | |
| 131 let legacyAPISupported = resolvedValues[2]; | |
| 132 if (!legacyAPISupported) | |
| 133 Prefs.safariContentBlocker = true; | |
| 134 | |
| 135 if (Prefs.safariContentBlocker) | |
| 136 updateContentBlocker(true, legacyAPISupported); | |
| 137 | |
| 138 Prefs.on("safariContentBlocker", () => | |
| 139 { | |
| 140 if (!contentBlockingActive && Prefs.safariContentBlocker) | |
| 141 updateContentBlocker(false, legacyAPISupported); | |
| 142 }); | |
| 143 | |
| 144 FilterNotifier.on("filter.behaviorChanged", () => | |
| 145 { | |
| 146 contentBlockListDirty = true; | |
| 147 if (contentBlockingActive) | |
| 148 updateContentBlocker(false, legacyAPISupported); | |
| 149 }); | |
| 150 }); | |
| 151 } | |
| 152 | |
| 153 port.on("safari.contentBlockingActive", (msg, sender) => | |
| 154 { | |
| 155 if (!contentBlockingActive && afterContentBlockingFinished) | |
| 156 return afterContentBlockingFinished; | |
| 157 return contentBlockingActive; | |
| 158 }); | |
| OLD | NEW |