Handle case where cache-control causes CORS issues

episphere · Jan 23, 2024 · e6d425f · e6d425f
1 parent 46d40d8
commit e6d425f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/imagebox3.js b/imagebox3.js
@@ -211,14 +211,14 @@ var imagebox3 = (() => {
     return response
   }
 
-  const getImagesInPyramid = async (imageID) => {
+  const getImagesInPyramid = async (imageID, cache=true) => {
     // Get all images in the pyramid.    
 
     tiff[imageID] = tiff[imageID] || {}
 
     try {
-
-      tiff[imageID].pyramid = tiff[imageID].pyramid || ( await GeoTIFF.fromUrl(imageID, { headers: {'Cache-Control': "no-cache, no-store"}}) )
+      const headers = cache ? { headers: {'Cache-Control': "no-cache, no-store"}} : {}
+      tiff[imageID].pyramid = tiff[imageID].pyramid || ( await GeoTIFF.fromUrl(imageID, headers) )
 
       const imageCount = await tiff[imageID].pyramid.getImageCount()
       if (tiff[imageID].pyramid.loadedCount !== imageCount) {
@@ -242,7 +242,10 @@ var imagebox3 = (() => {
       }
 
     } catch (e) {
-      console.error("Couldn't get images", e)  
+      console.error("Couldn't get images", e)
+      if (cache) { // Retry in case Cache-Control is not part of Access-Control-Allow-Headers in preflight response
+        await getImagesInPyramid(imageID, !cache)
+      }
     }
     return
   }

diff --git a/imagebox3.mjs b/imagebox3.mjs
@@ -190,14 +190,14 @@ const imagebox3 = (() => {
     return response
   }
 
-  const getImagesInPyramid = async (imageID) => {
+  const getImagesInPyramid = async (imageID, cache=true) => {
     // Get all images in the pyramid.    
 
     tiff[imageID] = tiff[imageID] || {}
 
     try {
-
-      tiff[imageID].pyramid = tiff[imageID].pyramid || ( await fromUrl(imageID, { headers: {'Cache-Control': "no-cache, no-store"}}) )
+      const headers = cache ? { headers: {'Cache-Control': "no-cache, no-store"}} : {}
+      tiff[imageID].pyramid = tiff[imageID].pyramid || ( await fromUrl(imageID, headers) )
 
       const imageCount = await tiff[imageID].pyramid.getImageCount()
       if (tiff[imageID].pyramid.loadedCount !== imageCount) {
@@ -221,7 +221,10 @@ const imagebox3 = (() => {
       }
 
     } catch (e) {
-      console.error("Couldn't get images", e)  
+      console.error("Couldn't get images", e)
+      if (cache) { // Retry in case Cache-Control is not part of Access-Control-Allow-Headers in preflight response
+        await getImagesInPyramid(imageID, !cache)
+      }
     }
     return
   }