Merge pull request #345 from ezzak/css_verif_refac

Cleanups post CSS support

Author: ezzak

src/js/config.ts

@@ -88,7 +88,7 @@ export const ORIGIN_TYPE = Object.freeze({
 export type Origin = keyof typeof ORIGIN_TYPE;
 
 // Firefox and Safari currently do not support CompressionStream/showSaveFilePicker
-export const DOWNLOAD_JS_ENABLED =
+export const DOWNLOAD_SRC_ENABLED =
   'CompressionStream' in window && 'showSaveFilePicker' in window;
 
 export const MANIFEST_TIMEOUT = 45000;

src/js/content.ts

@@ -7,7 +7,7 @@
 
 import {
   MESSAGE_TYPE,
-  DOWNLOAD_JS_ENABLED,
+  DOWNLOAD_SRC_ENABLED,
   STATES,
   Origin,
   ORIGIN_TYPE,
@@ -179,7 +179,7 @@ function handleManifestNode(manifestNode: HTMLScriptElement): void {
   }
 
   sendMessageToBackground(messagePayload, response => {
-    // then start processing of it's JS
+    // then start processing its JS/CSS
     if (response.valid) {
       if (manifestTimeoutID !== '') {
         clearTimeout(manifestTimeoutID);
@@ -225,16 +225,12 @@ export const processFoundElements = async (version: string): Promise<void> => {
           updateCurrentState(STATES.VALID);
         }
       } else {
-        if (response.type === 'EXTENSION') {
-          updateCurrentState(STATES.RISK);
-        } else {
-          updateCurrentState(STATES.INVALID, `Invalid Tag ${tagIdentifier}`);
-        }
+        updateCurrentState(STATES.INVALID, `Invalid Tag ${tagIdentifier}`);
       }
       sendMessageToBackground({
         type: MESSAGE_TYPE.DEBUG,
         log:
-          'processed JS with SRC response is ' +
+          'processed SRC response is ' +
           JSON.stringify(response).substring(0, 500),
         src: tagIdentifier,
       });
@@ -324,7 +320,7 @@ export function storeFoundElement(element: HTMLElement): void {
       updateCurrentState(STATES.INVALID, 'blob: src');
       return;
     }
-    if (script.src !== '' || script.innerHTML !== '') {
+    if (script.src !== '') {
       handleScriptNode(script);
     }
   } else if (element.nodeName.toLowerCase() === 'style') {
@@ -458,7 +454,7 @@ export function startFor(origin: Origin, config: ContentScriptConfig): void {
 }
 
 chrome.runtime.onMessage.addListener(request => {
-  if (request.greeting === 'downloadSource' && DOWNLOAD_JS_ENABLED) {
+  if (request.greeting === 'downloadSource' && DOWNLOAD_SRC_ENABLED) {
     downloadSrc();
   } else if (request.greeting === 'nocacheHeaderFound') {
     updateCurrentState(

src/js/content/contentUtils.ts

@@ -8,11 +8,11 @@
 import alertBackgroundOfImminentFetch from './alertBackgroundOfImminentFetch';
 
 import {TagDetails} from '../content';
-import {DOWNLOAD_JS_ENABLED, MESSAGE_TYPE} from '../config';
+import {DOWNLOAD_SRC_ENABLED, MESSAGE_TYPE} from '../config';
 import genSourceText from './genSourceText';
 import {sendMessageToBackground} from '../shared/sendMessageToBackground';
 import {getCurrentOrigin} from './updateCurrentState';
-import downloadJSArchive from './downloadJSArchive';
+import downloadArchive from './downloadArchive';
 
 const SOURCE_SCRIPTS_AND_STYLES = new Map();
 
@@ -40,7 +40,7 @@ async function processSrc(
         // If this is missing it will cause a cache miss, resulting in invalidation.
         headers: isServiceWorker ? {'Service-Worker': 'script'} : undefined,
       });
-      if (DOWNLOAD_JS_ENABLED) {
+      if (DOWNLOAD_SRC_ENABLED) {
         const fileNameArr = url.split('/');
         const fileName = fileNameArr[fileNameArr.length - 1].split('?')[0];
         const responseBody = sourceResponse.clone().body;
@@ -90,7 +90,7 @@ async function processSrc(
 }
 
 function downloadSrc(): void {
-  downloadJSArchive(SOURCE_SCRIPTS_AND_STYLES);
+  downloadArchive(SOURCE_SCRIPTS_AND_STYLES);
 }
 
 export {processSrc, downloadSrc};

src/js/content/downloadJSArchive.ts src/js/content/downloadArchive.tssrc/js/content/downloadJSArchive.ts renamed to src/js/content/downloadArchive.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-export default async function downloadJSArchive(
+export default async function downloadArchive(
   sourceScripts: Map<string, ReadableStream>,
 ): Promise<void> {
   const fileHandle = await window.showSaveFilePicker({

src/js/popup.ts

@@ -6,7 +6,7 @@
  */
 
 import {
-  DOWNLOAD_JS_ENABLED,
+  DOWNLOAD_SRC_ENABLED,
   MESSAGE_TYPE,
   ORIGIN_TYPE,
   STATES,
@@ -105,7 +105,7 @@ function attachListeners(origin: string | null): void {
   )[0];
   const downloadSrcButton = document.getElementById('i18nDownloadSourceButton');
 
-  if (DOWNLOAD_JS_ENABLED) {
+  if (DOWNLOAD_SRC_ENABLED) {
     const downloadPageSourceMenuItem = menuRowList[1];
     downloadPageSourceMenuItem.addEventListener('click', () =>
       updateDisplay('download'),