return to the classic allow / block behaviour (instead of clear) to prevent bugs, need to investigate, but later

Author: maximelebreton

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qjs",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/entry/background/actions.ts

@@ -2,6 +2,7 @@ import {
 
   clearJavascriptRule,
   getTabSetting,
+  removeConflictedRulesFromPattern,
   removeJavascriptRule,
   setJavascriptRule,
 } from "./contentsettings";
@@ -53,35 +54,46 @@ export const toggleJavaScript = async (tab: chrome.tabs.Tab) => {
     const { subdomain, scheme } = await getUrlAsObject(tab.url!);
     const setting = await getTabSetting(tab);
     cl(`setting for ${tab.url} : ${setting}`, Log.ACTIONS);
-    if (setting === "allow") {
-      if (scheme === "file") {
-        await handleBlockUrl(tab);
-      } else {
-        if (subdomain.length) {
-          await handleBlockSubdomain(tab);
-        } else {
-          await handleBlockDomain(tab);
-        }
-      }
+
+    if (scheme === "file") {
+      await handleToggleUrl(tab);
     } else {
-      if (scheme === "file") {
-        await handleAllowUrl(tab);
+      if (subdomain.length) {
+        await handleToggleSubdomain(tab);
       } else {
-        if (subdomain.length) {
-          if (tab.incognito === true) {
-            await handleAllowSubdomain(tab);
-          } else {
-            await handleClearSubdomain(tab);
-          }
-        } else {
-          if (tab.incognito === true) {
-            await handleAllowDomain(tab);
-          } else {
-            await handleClearDomain(tab);
-          }
-        }
+        await handleToggleDomain(tab);
       }
     }
+
+    // if (setting === "allow") {
+    //   if (scheme === "file") {
+    //     await handleBlockUrl(tab);
+    //   } else {
+    //     if (subdomain.length) {
+    //       await handleBlockSubdomain(tab);
+    //     } else {
+    //       await handleBlockDomain(tab);
+    //     }
+    //   }
+    // } else {
+    //   if (scheme === "file") {
+    //     await handleAllowUrl(tab);
+    //   } else {
+    //     if (subdomain.length) {
+    //       if (tab.incognito === true) {
+    //         await handleAllowSubdomain(tab);
+    //       } else {
+    //         await handleClearSubdomain(tab);
+    //       }
+    //     } else {
+    //       if (tab.incognito === true) {
+    //         await handleAllowDomain(tab);
+    //       } else {
+    //         await handleClearDomain(tab);
+    //       }
+    //     }
+    //   }
+    // }
   }
 
   // if (blockedSubdomainAndDomain) {
@@ -262,6 +274,55 @@ export const handlePause = async (tab: chrome.tabs.Tab) => {
   });
 };
 
+export const hanleToggleByPattern = async (tab: chrome.tabs.Tab, primaryPattern: string) => {
+
+  if (tab.url) {
+    const oldSetting = await getTabSetting(tab)
+    const newSetting = oldSetting === 'allow' ? 'block' : 'allow'
+
+    if (!primaryPattern) {
+      return
+    }
+    await removeConflictedRulesFromPattern(primaryPattern)
+
+    console.info(`toggle from ${oldSetting} to ${newSetting}: ` + primaryPattern);
+    await setJavascriptRule({
+      primaryPattern,
+      scope: getScopeSetting(tab.incognito),
+      setting: newSetting,
+      tab,
+    });
+    
+
+  }
+
+}
+
+export const handleToggleSubdomain = async (tab: chrome.tabs.Tab) => {
+  if (tab.url) {
+    const primaryPattern = getSubdomainPatternFromUrl(tab.url);
+    if (primaryPattern) {
+      await hanleToggleByPattern(tab, primaryPattern)
+    }
+  }
+}
+
+export const handleToggleDomain = async (tab: chrome.tabs.Tab) => {
+    if (tab.url) {
+      const primaryPattern = getDomainPatternFromUrl(tab.url);
+      if (primaryPattern) {
+        await hanleToggleByPattern(tab, primaryPattern)
+      }
+    }
+};    
+
+export const handleToggleUrl = async (tab: chrome.tabs.Tab) => {
+  if (tab.url) {
+    const primaryPattern = getUrlPatternFromUrl(tab.url);
+    await hanleToggleByPattern(tab, primaryPattern)
+  }
+}; 
+
 export const handleBlockSubdomain = async (tab: chrome.tabs.Tab) => {
   if (tab.url) {
     const primaryPattern = getSubdomainPatternFromUrl(tab.url);

src/entry/background/contentsettings.ts

@@ -1,6 +1,6 @@
 import { isValidPrimaryPattern } from "../options/computed";
 import { clearJavascriptRules, handleClear, reloadTab } from "./actions";
-import { cl, isAllowedPattern, Log } from "./utils";
+import { cl, isAllowedPattern, Log, sortUrlsByPatternPrecedence } from "./utils";
 import { updateIcon } from "./icon";
 import {
   getDomainStorageRulesFromUrl,
@@ -10,6 +10,7 @@ import {
   unsetStorageRule,
 } from "./storage";
 import { getUrlAsObject, isValidScheme } from "./utils";
+import { set } from "lodash";
 
 export type RuleSetting = "allow" | "block";
 
@@ -42,10 +43,14 @@ export const getJavascriptRuleSetting = async ({
   });
 };
 
+
+
 export const removeConflictedRulesFromPattern = async (tabPattern: string) => {
   const { scheme: tabScheme, subdomain: tabSubdomain, domain: tabDomain } = getUrlAsObject(tabPattern);
 
   const existingDomainRules = await getDomainStorageRulesFromUrl(tabPattern)
+  //const existingDomainPatterns = Object.values(existingDomainRules).map(({primaryPattern}) => primaryPattern)
+ // const sortedPatternsByPrecedence = sortUrlsByPatternPrecedence(existingDomainPatterns)
 
   Object.entries(existingDomainRules).forEach(async ([storagePattern, rule]) => {
     const { scheme: storageScheme, subdomain: storageSubdomain, domain: storageDomain } = getUrlAsObject(storagePattern);
@@ -55,7 +60,8 @@ export const removeConflictedRulesFromPattern = async (tabPattern: string) => {
       cl(`Conflicted rule removed: ${storagePattern} (conflict with url: ${tabPattern})`, Log.RULES)
     } 
     if ((tabSubdomain === '*.' && storageSubdomain === '') && tabDomain === storageDomain) {
-      console.warn(`Potential conflicted rule: ${storagePattern} (conflict with url: ${tabPattern})`)
+      await removeJavascriptRule(rule)
+      console.warn(`Conflicted rule removed: ${storagePattern} (conflict with url: ${tabPattern})`)
     }
   })
 
@@ -93,7 +99,7 @@ export const setJavascriptRule = ({
     // } else {
     //   await addJavascriptRule(rule);
     // }
-    await removeConflictedRulesFromPattern(rule.primaryPattern)
+    //await removeConflictedRulesFromPattern(rule.primaryPattern)
 
     await addJavascriptRule(rule);
     if (tab) {
@@ -124,8 +130,6 @@ export const clearJavascriptRule = ({
       return;
     }
 
-   // await removeConflictedRulesFromPattern(rule.primaryPattern)
-
     await removeJavascriptRule(rule);
     if (tab) {
       await updateIcon(tab); //not needed because we update tab

src/entry/background/events.ts

@@ -49,6 +49,15 @@ export const initEvents = () => {
     cl("ON WINDOW FOCUS CHANGED", Log.EVENTS);
     await updateContextMenus();
 
+
+    chrome.tabs.query({active: true, windowId: windowId}, async (tabs) => {
+      if (tabs.length > 0) {
+        let tab = tabs[0];
+        await updateIcon(tab);
+      }
+    });
+    
+
     // if (state && state.popup) {
     // CLOSE POPUP
     // chrome.windows.get(state.popup.id, (window) => {