updated localhost fetch function (#56)

* updated localhost fetch function * simplified localhost check * removed a log
NetsBlox · Jan 18, 2024 · 9e62af9 · 9e62af9
1 parent 9b2627f
commit 9e62af9
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 27 deletions.
diff --git a/extensions/AugmentedReality/index.js b/extensions/AugmentedReality/index.js
@@ -1,8 +1,22 @@
 (async function () {
 
   let videoMirrored = false;
-
-  const localhost = (await fetch('http://localhost:8000/extensions/AugmentedReality/index.js')).ok;
+
+  async function checkLocalhost(){
+    try {
+      const response = await fetch('http://localhost:8000/extensions/AugmentedReality/index.js');
+      if (!response.ok) {
+        console.log('INFO: Failed to reach localhost');
+        return false;
+      }else{
+        return true;
+      }
+    } catch (error) {
+      console.log("INFO: localhost fetch failed with error", error)
+      return false;
+    }
+  }
+  const localhost = await checkLocalhost();
   const root = localhost? 'http://localhost:8000/' : 'https://extensions.netsblox.org/';
 
   const rendererURL = root + 'extensions/AugmentedReality/js/renderModule.mjs';                

diff --git a/extensions/AugmentedReality/js/renderModule.mjs b/extensions/AugmentedReality/js/renderModule.mjs
@@ -4,7 +4,7 @@ import * as handModule from '../../HandGestures/handLandmarkerModule.mjs';
 import * as tagModule from './tagHandler.mjs';
 import * as filters from './filters.mjs';
 
-const localhost = (await fetch('http://localhost:8000/extensions/AugmentedReality/js/renderModule.mjs')).ok;
+const localhost = window.location.search.includes('localhost');
 const root = localhost? 'http://localhost:8000/' : 'https://extensions.netsblox.org/';
 
 const models = {};

diff --git a/extensions/AugmentedReality/js/tagHandler.mjs b/extensions/AugmentedReality/js/tagHandler.mjs
@@ -1,7 +1,5 @@
 const positVersion = 1;
 
-const localhost = (await fetch('http://localhost:8000/extensions/AugmentedReality/js/tagHandler.mjs')).ok;
-
 class aprilTagHandler {
   constructor() {
     this.detector = new AR.Detector({dictionaryName: 'APRILTAG_16h5'});

diff --git a/extensions/AugmentedReality/js/ui-morphs.js b/extensions/AugmentedReality/js/ui-morphs.js
@@ -1,18 +1,5 @@
-let root = 'https://extensions.netsblox.org/';
-fetch('http://localhost:8000/extensions/AugmentedReality/js/ui-morphs.js')
-  .then((value) => {
-    root = 'http://localhost:8000/';
-  })
-  .catch(() => {
-    //do nothing
-  })
-  .finally(() => {
-    console.log('done checking for localhost');
-  });
-
-function ArucoGenMorph (){
-  this.init();
-}
+const localhost = window.location.search.includes('localhost');
+const root = localhost? 'http://localhost:8000/' : 'https://extensions.netsblox.org/';
 
 ArucoGenMorph.prototype = new DialogBoxMorph();
 ArucoGenMorph.prototype.constructor = ArucoGenMorph;

diff --git a/extensions/FaceLandmarker/index.js b/extensions/FaceLandmarker/index.js
@@ -1,6 +1,6 @@
 (async function () {
-
-  const localhost = (await fetch('http://localhost:8000/extensions/FaceLandmarker/index.js')).ok;
+  
+  const localhost = window.location.search.includes('localhost');
   const root = localhost? 'http://localhost:8000/' : 'https://extensions.netsblox.org/';
 
   const DEVURL = {

diff --git a/extensions/HandGestures/handLandmarkerModule.mjs b/extensions/HandGestures/handLandmarkerModule.mjs
@@ -1,4 +1,19 @@
-const localhost = (await fetch('http://localhost:8000/extensions/HandGestures/handLandmarkerModule.mjs')).ok;
+async function checkLocalhost(){
+  try {
+    const response = await fetch('http://localhost:8000/extensions/HandGestures/handLandmarkerModule.mjs');
+    if (!response.ok) {
+      console.log('INFO: Failed to reach localhost');
+      return false;
+    }else{
+      return true;
+    }
+  } catch (error) {
+    console.log("INFO: localhost fetch failed with error", error)
+    return false;
+  }
+}
+
+const localhost = await checkLocalhost();
 const root = localhost? 'http://localhost:8000/' : 'https://extensions.netsblox.org/';
 
 const DEVURL = {

diff --git a/extensions/HandGestures/index.js b/extensions/HandGestures/index.js
@@ -1,6 +1,5 @@
 (async function () {
-
-  const localhost = (await fetch('http://localhost:8000/extensions/HandGestures/handLandmarkerModule.mjs')).ok;
+  const localhost = window.location.search.includes('localhost');  
   const root = localhost? 'http://localhost:8000/' : 'https://extensions.netsblox.org/';
 
   const moduleURL = root + 'extensions/HandGestures/handLandmarkerModule.mjs';

diff --git a/extensions/PoseLandmarker/index.js b/extensions/PoseLandmarker/index.js
@@ -1,6 +1,5 @@
 (async function () {
-
-  const localhost = (await fetch('http://localhost:8000/extensions/PoseLandmarker/index.js')).ok;
+  const localhost = window.location.search.includes('localhost');
   const root = localhost? 'http://localhost:8000/' : 'https://extensions.netsblox.org/';
 
   const DEVURL = {