cleanup finding source data from html page

GeckoDM · Jul 5, 2020 · 03835e8 · 03835e8
1 parent 8a627be
commit 03835e8
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/src/background.js b/app/src/background.js
@@ -1,12 +1,20 @@
 async function getDownloadLink({lessonID, lessonName}, echo360Domain, downloadHD) {
-  const regex = /(?:\(\")(?:.*)(?:\"\))/;
+  const classroomAppRegex = new RegExp('(classroomApp)');
+  const dataRegex = /(?:\(\")(?:.*)(?:\"\))/;
   const lessonHTMLPageRequest = new Request(`${echo360Domain}/lesson/${lessonID}/classroom`, { method: 'GET', credentials: 'include' });
   const lessonHTMLPageResponse = await fetch(lessonHTMLPageRequest)
   const lessonHTMLPageText = await lessonHTMLPageResponse.text();
   const dummyEl = document.createElement('html')
   dummyEl.innerHTML = lessonHTMLPageText;
+  const videoDataScript = Array.from(dummyEl.getElementsByTagName('script')).filter((script) => classroomAppRegex.test(script.innerText));
 
-  const videoDataString = dummyEl.getElementsByTagName('script')[11].innerText.match(regex)[0]
+  if (videoDataScript.length === 0)
+  {
+    return null;
+  }
+
+  const videoDataString = videoDataScript[0].innerText.match(dataRegex)[0];
+
   const cleanString = videoDataString.substring(1, videoDataString.length - 1);
   const videoDataObject = JSON.parse(JSON.parse(cleanString));