Mirrors
/
noscript
mirror of https://github.com/hackademix/noscript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporary settings survival more resilient and compatible with Fenix.

This commit is contained in:
hackademix 2020-08-20 15:56:52 +02:00
parent fa81d3791a
commit 7785661d97
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/bg/LifeCycle.js
View File

@ -75,26 +75,43 @@ var LifeCycle = (() => {
unrestrictedTabs: [...ns.unrestrictedTabs]
}));
await new Promise((resolve, reject) => {
let l = async (tabId, changeInfo) => {
debug("Survival tab updating", changeInfo);
if (changeInfo.status !== "complete") return;
try {
await Messages.send("store", {url, data: toBase64(new Uint8Array(cypherText))}, {tabId, frameId: 0});
resolve();
debug("Survival tab updated");
browser.tabs.onUpdated.removeListener(l);
} catch (e) {
if (!Messages.isMissingEndpoint(e)) {
error(e, "Survival tab failed");
reject(e);
} // otherwise we keep waiting for further updates from the tab until content script is ready to answer
try {
await new Promise((resolve, reject) => {
let done = false;
let l = async (tabId, changeInfo) => {
if (done || tabId !== tab.id) return;
debug("Survival tab updating", changeInfo);
if (changeInfo.status !== "complete") return;
try {
await Messages.send("store", {url, data: toBase64(new Uint8Array(cypherText))}, {tabId, frameId: 0});
done = true;
resolve();
debug("Survival tab updated");
} catch (e) {
if (!Messages.isMissingEndpoint(e)) {
error(e, "Survival tab failed");
reject(e);
} // otherwise we keep waiting for further updates from the tab until content script is ready to answer
return false;
};
return true;
};
try {
browser.tabs.onUpdated.addListener(l);
} catch (e) {
reject(e);
}
});
await Storage.set("local", { "updateInfo": {key, iv: toBase64(iv), tabId}});
tabId = -1;
debug("Ready to reload...", await Storage.get("local", "updateInfo"));
} finally {
if (tabId !== -1 && !ns.local.debug) {
browser.tabs.remove(tabId); // cleanup on failure unless we want to debug a post-mortem
}
browser.tabs.onUpdated.addListener(l, {tabId});
});
await Storage.set("local", { "updateInfo": {key, iv: toBase64(iv), tabId}});
debug("Ready to reload...", await Storage.get("local", "updateInfo"));
}
},
async retrieveAndDestroy() {