Added retries to scene loading (playcanvas#3418)

yaustar · steveny-sc · web-flow · commit 957f7176e49d · 2021-08-19T18:02:27.000+01:00
Co-authored-by: Steven Yau &lt;syau@snapchat.com&gt;
diff --git a/src/resources/hierarchy.js b/src/resources/hierarchy.js
@@ -8,7 +8,7 @@ class HierarchyHandler {
     }
 
     load(url, callback) {
-        SceneUtils.load(url, callback);
+        SceneUtils.load(url, this.maxRetries, callback);
     }
 
     open(url, data) {
diff --git a/src/resources/scene-settings.js b/src/resources/scene-settings.js
@@ -7,7 +7,7 @@ class SceneSettingsHandler {
     }
 
     load(url, callback) {
-        SceneUtils.load(url, callback);
+        SceneUtils.load(url, this.maxRetries, callback);
     }
 
     open(url, data) {
diff --git a/src/resources/scene-utils.js b/src/resources/scene-utils.js
@@ -8,9 +8,10 @@ const SceneUtils = {
      * @name SceneUtils.load
      * @description Loads the scene JSON file from a URL.
      * @param {string} url - URL to scene JSON.
+     * @param {number} maxRetries - Number of http load retry attempts.
      * @param {Function} callback - The callback to the JSON file is loaded.
      */
-    load: function (url, callback) {
+    load: function (url, maxRetries, callback) {
         if (typeof url === 'string') {
             url = {
                 load: url,
@@ -19,8 +20,8 @@ const SceneUtils = {
         }
 
         http.get(url.load, {
-            retry: this.maxRetries > 0,
-            maxRetries: this.maxRetries
+            retry: maxRetries > 0,
+            maxRetries: maxRetries
         }, function (err, response) {
             if (!err) {
                 callback(err, response);
diff --git a/src/resources/scene.js b/src/resources/scene.js
@@ -15,7 +15,7 @@ class SceneHandler {
     }
 
     load(url, callback) {
-        SceneUtils.load(url, callback);
+        SceneUtils.load(url, this.maxRetries, callback);
     }
 
     open(url, data) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class HierarchyHandler {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`load(url, callback) {`
`11`		`- SceneUtils.load(url, callback);`
	`11`	`+ SceneUtils.load(url, this.maxRetries, callback);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`open(url, data) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class SceneSettingsHandler {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`load(url, callback) {`
`10`		`- SceneUtils.load(url, callback);`
	`10`	`+ SceneUtils.load(url, this.maxRetries, callback);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`open(url, data) {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class SceneHandler {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`load(url, callback) {`
`18`		`- SceneUtils.load(url, callback);`
	`18`	`+ SceneUtils.load(url, this.maxRetries, callback);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`open(url, data) {`