Maintain violations when tab ID is reused

package.json

@@ -9,7 +9,7 @@
   "type": "module",
   "private": true,
   "engines": {
-    "node": ">= 18"
+    "node": ">= 20"
   },
   "scripts": {
     "build": "yarn run rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript",
@@ -24,9 +24,9 @@
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/chrome": "^0.1.4",
     "@types/jest": "^29.4.0",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "eslint": "^7.32.0",
+    "@typescript-eslint/eslint-plugin": "8.29.1",
+    "@typescript-eslint/parser": "8.29.1",
+    "eslint": "9.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.0.0",
     "prettier": "^2.3.2",

src/js/background.ts

@@ -147,7 +147,7 @@ function handleMessages(
       if (message.pkgRaw.includes(DYNAMIC_STRING_MARKER)) {
         try {
           message.pkgRaw = removeDynamicStrings(message.pkgRaw);
-        } catch (e) {
+        } catch {
           sendResponse({valid: false, reason: 'failed parsing AST'});
           return;
         }

src/js/background/historyManager.ts

@@ -67,14 +67,17 @@ export async function upsertInvalidRecord(
   const tabIDKey = String(tabID);
   const entry = await chrome.storage.local.get(tabIDKey);
 
+  const violations = TAB_TO_VIOLATING_SRCS.get(tabID) ?? new Set();
+
   if (Object.keys(entry).length !== 0) {
     creationTime = entry[tabIDKey].creationTime;
+    entry[tabIDKey].violations.forEach(violation => {violations.add(violation)});
   }
 
   return chrome.storage.local.set({
     [tabIDKey]: {
       creationTime,
-      violations: Array.from(TAB_TO_VIOLATING_SRCS.get(tabID) ?? new Set()),
+      violations: Array.from(violations),
       url: tab.url,
     },
   });

src/js/background/tab_state_tracker/TabStateMachine.ts

@@ -110,6 +110,7 @@ export default class TabStateMachine extends StateMachine {
          * For more details on how this suppresses the error:
          * See: https://stackoverflow.com/questions/28431505/unchecked-runtime-lasterror-when-using-chrome-api/28432087#28432087
          */
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         chrome.runtime.lastError && chrome.runtime.lastError.message;
       },
     );

src/js/content.ts

@@ -103,7 +103,7 @@ function handleManifestNode(manifestNode: HTMLScriptElement): void {
   const manifestNodeTextContent = manifestNode.textContent ?? '';
   try {
     rawManifest = JSON.parse(manifestNodeTextContent);
-  } catch (manifestParseError) {
+  } catch {
     setTimeout(() => parseFailedJSON({node: manifestNode, retry: 5000}), 20);
     return;
   }
@@ -304,7 +304,7 @@ export function storeFoundElement(element: HTMLElement): void {
   if (element.getAttribute('type') === 'application/json') {
     try {
       JSON.parse(nodeTextContent);
-    } catch (parseError) {
+    } catch {
       setTimeout(() => parseFailedJSON({node: element, retry: 1500}), 20);
     }
     return;
@@ -390,7 +390,7 @@ export const scanForScriptsAndStyles = (): void => {
       childList: true,
       subtree: true,
     });
-  } catch (_UnknownError) {
+  } catch {
     updateCurrentState(STATES.INVALID, 'unknown');
   }
 };

src/js/content/manualCSSInspector.ts

@@ -98,8 +98,9 @@ function isValidCSSRule(rule: CSSRule): boolean {
 function ensureCORSEnabledForStylesheet(styleSheet: CSSStyleSheet): void {
   try {
     // Ensure all non same origin stylesheets can be accessed (CORS)
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     styleSheet.cssRules;
-  } catch (e) {
+  } catch {
     updateStateOnInvalidStylesheet(false, styleSheet);
   }
 }

src/js/content/parseFailedJSON.ts

@@ -27,7 +27,7 @@ export function parseFailedJSON(queuedJsonToParse: {
   const nodeTextContent = queuedJsonToParse.node.textContent ?? '';
   try {
     JSON.parse(nodeTextContent);
-  } catch (parseError) {
+  } catch {
     if (queuedJsonToParse.retry > 0) {
       queuedJsonToParse.retry--;
       setTimeout(() => parseFailedJSON(queuedJsonToParse), 20);

src/js/popup/popup.ts

@@ -294,7 +294,7 @@ let currentOrigin: Origin;
   const params = new URL(document.location.href).searchParams;
   setUpBackgroundMessageHandler(params.get('tab_id'));
   const state = params.get('state') as State;
-  state && updateDisplay(state);
+  updateDisplay(state);
   attachTextToHtml();
   currentOrigin = params.get('origin') as Origin;
   attachMenuListeners(currentOrigin);