fix race condition that make extension to be loaded twice, use isLoad…

…edState[id] instead of isLoading to prevent it
luc-github · Dec 5, 2024 · afc4148 · afc4148
1 parent a57ec62
commit afc4148
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/info.json b/info.json
@@ -1,3 +1,3 @@
 {
-    "version": "3.0.0-a81"
+    "version": "3.0.0-a82"
   }
diff --git a/src/components/App/version.js b/src/components/App/version.js
@@ -17,7 +17,7 @@
 */
 import { h } from "preact"
 import { webUIbuild } from "../../targets"
-export const webUIversion = "3.0.0-a81"
+export const webUIversion = "3.0.0-a82"
 export const Esp3dVersion = () => (
     <span>
         {webUIversion}.{webUIbuild}

diff --git a/src/components/ExtraContent/extraContentItem.js b/src/components/ExtraContent/extraContentItem.js
@@ -82,6 +82,7 @@ const ExtraContentItem = ({
         setContentUrl(url)
         setHasError(false)
         setIsLoading(false)
+        isLoadedState[id] = true;
     }, [type])
 
     const handleContentError = useCallback((error) => {
@@ -103,21 +104,24 @@ const ExtraContentItem = ({
             return
         }
         //console.log("Loading content for " + id)
-        setIsLoading(true)
         if (source.startsWith("http")) {
             setContentUrl(source)
             setHasError(false)
             setIsLoading(false)
-            isLoadedState[id] = true;
+            isLoadedState[id] = true
         } else {
+            if (isLoadedState[id]){
+                return
+            }
+            setIsLoading(true)
             const idquery = type === "content" ? type + id : "download" + id
             let url = source
             if (url.endsWith(".gz")) {
                 url = url.substring(0, url.length - 3)
             }
             createNewRequest(
                 espHttpURL(url),
-                { method: "GET", id: idquery, max: 2 },
+                { method: "GET", id: idquery, max: 1 },
                 {
                     onSuccess: handleContentSuccess,
                     onFail: handleContentError,
@@ -138,6 +142,7 @@ const ExtraContentItem = ({
                 const element = document.getElementById(id)
                 if ( 'forceRefresh' in msg && msg.forceRefresh) {
                     //console.log(`Processing forceRefresh for ${id}`);
+                    isLoadedState[id] = false;
                     loadContent()
                 }
                 if ('isVisible' in msg) {