Fix #3

jacopo-j · Sep 23, 2020 · 8004229 · 8004229
1 parent 995c44c
commit 8004229
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/src/background.js b/src/background.js
@@ -0,0 +1,16 @@
+chrome.runtime.onMessage.addListener(
+    function(request, sender, sendResponse) {
+        if (request.fetchJson) {
+            fetch(request.fetchJson)
+                .then(response => response.json())
+                .then(response => sendResponse(response));
+            return true;
+        }
+        if (request.fetchText) {
+            fetch(request.fetchText)
+                .then(response => response.text())
+                .then(response => sendResponse(response));
+            return true;
+        }
+    }
+)
diff --git a/src/content.js b/src/content.js
@@ -23,33 +23,28 @@ var observer = new MutationObserver(function(mutations) {
         let subdomain = match[1];
         let sitename = match[2];
         let recording_id = match[3];;
-        fetch(`https://${subdomain}.webex.com/webappng/api/v1/recordings/${recording_id}/stream?siteurl=${sitename}`)
-            .then(response => response.json())
-            .then(data => {
+        chrome.runtime.sendMessage(
+            {fetchJson: `https://${subdomain}.webex.com/webappng/api/v1/recordings/${recording_id}/stream?siteurl=${sitename}`},
+            function(data) {
                 let host = data["mp4StreamOption"]["host"];
                 let recording_dir = data["mp4StreamOption"]["recordingDir"];
                 let timestamp = data["mp4StreamOption"]["timestamp"];
                 let token = data["mp4StreamOption"]["token"];
                 let xml_name = data["mp4StreamOption"]["xmlName"];
                 let playback_option = data["mp4StreamOption"]["playbackOption"];
-                let meeting_name = data["recordName"];
-                fetch(`${host}/apis/html5-pipeline.do?recordingDir=${recording_dir}&timestamp=${timestamp}&token=${token}&xmlName=${xml_name}&isMobileOrTablet=false&ext=${playback_option}`)
-                    .then(response => response.text())
-                    .then(text => (new window.DOMParser()).parseFromString(text, "text/xml"))
-                    .then(data => {
+                chrome.runtime.sendMessage(
+                    {fetchText: `${host}/apis/html5-pipeline.do?recordingDir=${recording_dir}&timestamp=${timestamp}&token=${token}&xmlName=${xml_name}&isMobileOrTablet=false&ext=${playback_option}`},
+                    function(text) {
+                        let data = (new window.DOMParser()).parseFromString(text, "text/xml");
                         let filename = data.getElementsByTagName("Sequence")[0].textContent;
                         let mp4Url = `${host}/apis/download.do?recordingDir=${recording_dir}&timestamp=${timestamp}&token=${token}&fileName=${filename}`;
                         i.addEventListener("click", function() {
                             window.location = mp4Url;
                         })
-                    })
-                    .catch(exception => {
-                        console.log("Error")
-                    });
-            })
-            .catch(exception => {
-                console.log("Error")
-            });
+                    }
+                )
+            }
+        )
     }
 });
 

diff --git a/src/manifest.json b/src/manifest.json
@@ -4,7 +4,7 @@
   },
   "name": "WebXDownloader",
   "manifest_version": 2,
-  "version": "1.1",
+  "version": "1.1.1",
   "description": "Extracts the HLS stream of Webex meeting recordings",
   "browser_action": {
     "default_icon": "icon.png",
@@ -16,6 +16,9 @@
     "matches": ["*://*.webex.com/*"],
     "run_at": "document_end"
   }],
+  "background": {
+    "scripts": ["background.js"]
+  },
   "homepage_url": "https://github.com/jacopo-j/WebXDownloader",
   "permissions": [
     "tabs",

diff --git a/src/popup.html b/src/popup.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <meta charset="utf-8"/>
         <style>
             body {
                 width: 20em;