🔀 Merge pull request #494 from FrostCo/fix_crunchyroll

Fix crunchyroll

Author: richardfrost

src/script/background.ts

@@ -136,30 +136,10 @@ export default class Background {
     this.LOGGER.info('disabling tab once.', tabId);
   }
 
-  static async getGlobalVariable(variableName: string, sender, sendResponse) {
-    const [{ result }] = await chrome.scripting.executeScript({
-      func: this.getWindowVariable,
-      args: [variableName],
-      target: { tabId: sender.tab.id, frameIds: [sender.frameId] },
-      world: 'MAIN',
-    });
-    sendResponse(result);
-  }
-
   static getTabOptions(storage: BackgroundStorage, tabId: number): TabStorageOptions {
     return storage.tabs[tabId] || this.newTabOptions(storage, tabId);
   }
 
-  // variableName Supports '.' notation for nested values: window.nested.value
-  static getWindowVariable(variableName: string) {
-    try {
-      const properties = variableName.split('.');
-      return properties.reduce((prev, curr) => prev && prev[curr], window);
-    } catch {
-      return null;
-    }
-  }
-
   static async handleBackgroundDataRequest(request: Message, sender: chrome.runtime.MessageSender, sendResponse) {
     const storage = await this.loadBackgroundStorage();
     const tabId = request.source == this.Constants.MESSAGING.CONTEXT ? sender.tab.id : request.tabId;
@@ -284,11 +264,9 @@ export default class Background {
         } else if (request.fetch) {
           this.handleRequest(request.fetch, request.fetchMethod, sendResponse);
           return true; // return true when waiting on an async call
-        } else if (request.globalVariable) {
-          this.getGlobalVariable(request.globalVariable, sender, sendResponse);
-          return true; // return true when waiting on an async call
         } else {
           this.onContextMessageElse(chromeAction, request, sender, sendResponse);
+          return true; // return true when waiting on an async call
         }
         break;
 

src/script/lib/helper.ts

@@ -111,25 +111,6 @@ export function getElements(selector: string, root: Document | HTMLElement | Sha
   }
 }
 
-export function getGlobalVariable(code: string, id: string = 'APFData') {
-  const script = document.createElement('script');
-  script.id = id;
-  script.textContent = `document.getElementById("${id}").textContent = JSON.stringify(${code})`;
-  document.documentElement.appendChild(script);
-  const result = document.querySelector(`script#${id}`).textContent;
-  script.remove();
-  return JSON.parse(result);
-}
-
-export function getGlobalVariableFromBackground(globalVariable: string, source = 'context') {
-  return new Promise((resolve, reject) => {
-    const message: Message = { destination: 'background', globalVariable: globalVariable, source: source };
-    chrome.runtime.sendMessage(message, (response) => {
-      resolve(response);
-    });
-  });
-}
-
 export function getParent(node: HTMLElement, level: number = 1): HTMLElement {
   if (!node) {
     return null;