Second request rollback (#31)

discoveryjs · Sep 12, 2019 · 103936f · 103936f
1 parent ddca3b6
commit 103936f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.5.4 (11-09-2019)
+
+* Do not use second request, match JSON on markup instead
+
 ## 1.5.3 (01-09-2019)
 
 * Fixed false extension triggering on some sites

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsondiscovery",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "DiscoveryJson",
   "author": "[email protected]",
   "license": "MIT",

diff --git a/src/content/init.js b/src/content/init.js
@@ -12,20 +12,17 @@ export async function init(getSettings) {
     let json;
     let raw;
 
+    const { firstElementChild } = document.body;
     let { textContent } = document.body;
+
     textContent = textContent.trim();
 
-    if (textContent.startsWith('{') || textContent.startsWith('[')) {
+    if (
+        (firstElementChild && firstElementChild.tagName === 'PRE') &&
+        (textContent.startsWith('{') || textContent.startsWith('['))
+    ) {
         try {
-            if (!window.location.protocol.startsWith('file')) {
-                let fetchTest = await (await fetch(window.location.href)).text();
-                fetchTest = fetchTest.trim();
-                if (fetchTest.startsWith('{') || fetchTest.startsWith('[')) {
-                    json = JSON.parse(textContent);
-                }
-            } else {
-                json = JSON.parse(textContent);
-            }
+            json = JSON.parse(textContent);
         } catch (_) {}
     }