taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

fix errors in injection

Browse Source 
Sometimes chrome reports a different URL for a tab than what it is
internally displaying (e.g. for error pages).  Previously this lead to a
"scary" error message being logged.
This commit is contained in:
Florian Dold 2017-08-09 16:51:25 +02:00
parent 1f8c3af5f9
commit 419a05e801
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/webex/wxBackend.ts
View File

@ -525,6 +525,24 @@ async function reinitWallet() {
} }
/**
* Inject a script into a tab. Gracefully logs errors
* and works around a bug where the tab's URL does not match the internal URL,
* making the injection fail in a confusing way.
*/
function injectScript(tabId: number, details: chrome.tabs.InjectDetails, actualUrl: string): void {
chrome.tabs.executeScript(tabId, details, () => {
// Required to squelch chrome's "unchecked lastError" warning.
// Sometimes chrome reports the URL of a tab as http/https but
// injection fails. This can happen when a page is unloaded or
// shows a "no internet" page etc.
if (chrome.runtime.lastError) {
console.warn("injection failed on page", actualUrl, chrome.runtime.lastError.message);
}
});
}
/** /**
* Main function to run for the WebExtension backend. * Main function to run for the WebExtension backend.
* *
@ -548,16 +566,17 @@ export async function wxMain() {
return; return;
} }
const uri = new URI(tab.url); const uri = new URI(tab.url);
if (uri.protocol() === "http" || uri.protocol() === "https") { if (uri.protocol() !== "http" && uri.protocol() !== "https") {
console.log("injecting into existing tab", tab.id); return;
chrome.tabs.executeScript(tab.id, { file: "/dist/contentScript-bundle.js" });
const code = `
if (("taler" in window) || document.documentElement.getAttribute("data-taler-nojs")) {
document.dispatchEvent(new Event("taler-probe-result"));
}
`;
chrome.tabs.executeScript(tab.id, { code, runAt: "document_idle" });
} }
console.log("injecting into existing tab", tab.id, "with url", uri.href(), "protocol", uri.protocol());
injectScript(tab.id, { file: "/dist/contentScript-bundle.js" }, uri.href());
const code = `
if (("taler" in window) || document.documentElement.getAttribute("data-taler-nojs")) {
document.dispatchEvent(new Event("taler-probe-result"));
}
`;
injectScript(tab.id, { code, runAt: "document_idle" }, uri.href());
} }
}); });
@ -598,7 +617,7 @@ export async function wxMain() {
document.dispatchEvent(new Event("taler-probe-result")); document.dispatchEvent(new Event("taler-probe-result"));
} }
`; `;
chrome.tabs.executeScript(tab.id!, { code, runAt: "document_start" }); injectScript(tab.id!, { code, runAt: "document_start" }, uri.href());
}); });
}; };