Fixed bug in policy fetching.
This commit is contained in:
parent
25fd1727b6
commit
08a41b3a62
|
@ -142,7 +142,8 @@
|
||||||
|
|
||||||
async fetchChildPolicy({url, contextUrl}, sender) {
|
async fetchChildPolicy({url, contextUrl}, sender) {
|
||||||
await ns.initializing;
|
await ns.initializing;
|
||||||
return (this.fetchChildPolicy = this.fetchChildPolicySync)(...arguments);
|
return (messageHandler.fetchChildPolicy =
|
||||||
|
messageHandler.fetchChildPolicySync)(...arguments);
|
||||||
},
|
},
|
||||||
fetchChildPolicySync({url, contextUrl}, sender) {
|
fetchChildPolicySync({url, contextUrl}, sender) {
|
||||||
let {tab, frameId} = sender;
|
let {tab, frameId} = sender;
|
||||||
|
|
|
@ -35,14 +35,27 @@
|
||||||
|
|
||||||
fetchPolicy() {
|
fetchPolicy() {
|
||||||
let url = document.URL;
|
let url = document.URL;
|
||||||
if (url.startsWith("http")) {
|
debug(`Fetching policy from document %s, readyState %s, content %s`,
|
||||||
|
url, document.readyState, document.documentElement.outerHTML);
|
||||||
|
|
||||||
|
if (!/^(?:file|ftp|https?):/i.test(url)) {
|
||||||
(async () => {
|
(async () => {
|
||||||
this.setup(await Messages.send("fetchChildPolicy", {url, contextUrl: url}));
|
let policy;
|
||||||
|
try {
|
||||||
|
policy = await Messages.send("fetchChildPolicy", {url, contextUrl: url});
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Error while fetching policy", e);
|
||||||
|
}
|
||||||
|
if (policy === undefined) {
|
||||||
|
log("Policy was undefined, retrying in 1/2 sec...");
|
||||||
|
setTimeout(() => this.fetchPolicy(), 500);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.setup(policy);
|
||||||
})();
|
})();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
debug(`Fetching policy from document %s, readyState %s, content %s`,
|
|
||||||
url, document.readyState, document.documentElement.outerHTML);
|
|
||||||
let originalState = document.readyState;
|
let originalState = document.readyState;
|
||||||
let blockedScripts = [];
|
let blockedScripts = [];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue