feat: disable replace for page (atm no indicator change or settings p…

…age)
nobkd · Apr 9, 2023 · 8b2469f · 8b2469f
1 parent 7db1f29
commit 8b2469f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 22 deletions.
diff --git a/src/bg/action.ts b/src/bg/action.ts
@@ -4,5 +4,5 @@ import { invertDisabled } from './utils/storage';
 browserAction.onClicked.addListener(async (tab: Tabs.Tab) => {
     if (!tab.url) return;
     await invertDisabled(tab.url);
-    tabs.reload(tab.id);
+    tabs.reload(tab.id, { bypassCache: true });
 });
diff --git a/src/bg/bg.ts b/src/bg/bg.ts
@@ -1,5 +1,5 @@
-import { runtime, webRequest, type WebRequest } from 'webextension-polyfill';
-//import { getDisabled } from './utils/storage';
+import { storage, runtime, webRequest, type WebRequest } from 'webextension-polyfill';
+import { getAllDisabled, getHostname, KEY_DISABLED } from './utils/storage';
 
 const patterns: string[] = [
     'http://*/maps/embed*?*',
@@ -14,15 +14,22 @@ const matcher: RegExp = new RegExp(
     `^(https?:\/\/)?(maps\.google\.(${gLocales})\/maps.*\?.*output=embed|(www\.)?google\.(${gLocales})\/maps\/embed.*\?)`
 );
 
-/*async*/ function redirect(
-    req: WebRequest.OnBeforeRequestDetailsType
-): /*Promise<*/ WebRequest.BlockingResponse /*>*/ {
+let disabledUrls: string[] = await getAllDisabled();
+storage.local.onChanged.addListener((changes) => {
+    if (KEY_DISABLED in changes) {
+        console.log(changes)
+        disabledUrls = changes[KEY_DISABLED].newValue;
+    }
+});
+
+function redirect(req: WebRequest.OnBeforeRequestDetailsType): WebRequest.BlockingResponse {
     if (req.originUrl && req.url.match(matcher)) {
-        //if (!await getDisabled(req.originUrl)) {
-        return {
-            redirectUrl: runtime.getURL('map.html?' + req.url.split('?')[1]),
-        };
-        //}
+        console.log(req.originUrl);
+        if (!disabledUrls.includes(getHostname(req.originUrl))) {
+            return {
+                redirectUrl: runtime.getURL('map.html?' + req.url.split('?')[1]),
+            };
+        }
     }
     return {};
 }

diff --git a/src/bg/utils/storage.ts b/src/bg/utils/storage.ts
@@ -4,23 +4,28 @@ export type HostnameStatus = {
     [key: string]: boolean;
 };
 
-export async function getDisabled(url: string): Promise<boolean> {
-    const hostname = getHostname(url);
-    let res = await storage.local.get(hostname);
-    return res[hostname] ?? false;
+export const KEY_DISABLED = 'disabled_urls';
+
+export async function getAllDisabled(): Promise<string[]> {
+    return (await storage.local.get(KEY_DISABLED))[KEY_DISABLED] ?? [];
 }
 
-export async function invertDisabled(url: string) {
+export async function invertDisabled(url: string): Promise<void> {
+    url = getHostname(url);
+    const disabledUrls = await getAllDisabled();
+
+    if (disabledUrls.includes(url)) {
+        disabledUrls.splice(disabledUrls.indexOf(url), 1);
+    } else {
+        disabledUrls.push(url);
+    }
+
     await storage.local.set({
-        [getHostname(url)]: !(await getDisabled(url)),
+        [KEY_DISABLED]: disabledUrls,
     });
 }
 
-export async function getAll(): Promise<HostnameStatus> {
-    return await storage.local.get();
-}
-
-function getHostname(url: string): string {
+export function getHostname(url: string): string {
     url = url.replace(/^\w+:\/\//, '');
     url = url.split(/[\/#]/, 1)[0];
     return url;