external/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2024-11-10 01:01:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't reregister contentscripts if not necessary

Browse source
This commit is contained in:
Ajay 2023-08-11 12:39:48 -04:00
parent 93d695e6c2
commit 6aeefaae64
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/background.ts
View file

@ -153,6 +153,27 @@ chrome.runtime.onInstalled.addListener(function () {
* @param {JSON} options
*/
async function registerFirefoxContentScript(options: Registration) {
if ("scripting" in chrome && "getRegisteredContentScripts" in chrome.scripting) {
// Bug in Firefox where you need to use browser namespace for this call
const getContentScripts = async (filter: browser.scripting.ContentScriptFilter) => {
if (isFirefoxOrSafari()) {
return await browser.scripting.getRegisteredContentScripts(filter);
} else {
return await chrome.scripting.getRegisteredContentScripts(filter);
}
};
const existingRegistrations = await getContentScripts({
ids: [options.id]
});
if (existingRegistrations.length > 0
&& existingRegistrations[0].matches.every((match) => options.matches.includes(match))) {
// No need to register another script, already registered
return;
}
}
await unregisterFirefoxContentScript(options.id);
if ("scripting" in chrome && "getRegisteredContentScripts" in chrome.scripting) {
@ -180,25 +201,11 @@ async function registerFirefoxContentScript(options: Registration) {
* Only works on Firefox.
* Firefox requires that this is handled by the background script
*/
async function unregisterFirefoxContentScript(id: string) {
async function unregisterFirefoxContentScript(id: string) {
if ("scripting" in chrome && "getRegisteredContentScripts" in chrome.scripting) {
// Bug in Firefox where you need to use browser namespace for this call
const getContentScripts = async (filter: browser.scripting.ContentScriptFilter) => {
if (isFirefoxOrSafari()) {
return await browser.scripting.getRegisteredContentScripts(filter);
} else {
return await chrome.scripting.getRegisteredContentScripts(filter);
}
};
const existingRegistrations = await getContentScripts({
await chrome.scripting.unregisterContentScripts({
ids: [id]
});
if (existingRegistrations?.length > 0) {
await chrome.scripting.unregisterContentScripts({
ids: existingRegistrations.map((script) => script.id),
});
}
} else {
if (contentScriptRegistrations[id]) {
contentScriptRegistrations[id].unregister();

1
src/utils.ts
View file

@ -54,7 +54,6 @@ export default class Utils {
if (!isFirefoxOrSafari() || isSafari()) {
permissions.push("webNavigation");
}
console.log(permissions)
chrome.permissions.request({
origins: this.getPermissionRegex(),