@vpmedia/phaser 1.7.0 → 1.9.0

package/README.md

@@ -1,7 +1,7 @@
 @vpmedia/phaser
 ===============
 
-[![npm version](https://badge.fury.io/js/@vpmedia%2Fphaser.svg?v=1.7.0)](https://badge.fury.io/js/@vpmedia%2Fphaser)
+[![npm version](https://badge.fury.io/js/@vpmedia%2Fphaser.svg?v=1.9.0)](https://badge.fury.io/js/@vpmedia%2Fphaser)
 [![Node.js CI](https://github.com/vpmedia/phaser/actions/workflows/node.js.yml/badge.svg)](https://github.com/vpmedia/phaser/actions/workflows/node.js.yml)
 
 @vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "@vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",
@@ -21,16 +21,16 @@
   ],
   "main": "./src/index.js",
   "devDependencies": {
-    "eslint": "^8.33.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jsdoc": "^39.7.4",
+    "eslint-plugin-jsdoc": "^40.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.3",
-    "jest": "^29.4.1",
-    "lint-staged": "^13.1.0",
-    "prettier": "^2.8.3"
+    "jest": "^29.5.0",
+    "lint-staged": "^13.2.0",
+    "prettier": "^2.8.5"
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",

package/src/phaser/core/loader.js

@@ -15,6 +15,9 @@ export default class {
     this.game = game;
     this.cache = game.cache;
     this.isLoading = false;
+    this.isUseLog = false;
+    this.isUseRetry = true;
+    this.maxRetry = 1;
     this.hasLoaded = false;
     this.preloadSprite = null;
     this.crossOrigin = false;
@@ -427,9 +430,9 @@ export default class {
       // Flight queue is empty but file list is not done being processed.
       // This indicates a critical internal error with no known recovery.
       console.warn('Loader - aborting: processing queue empty, loading may have stalled');
-      const _this = this;
+      const scope = this;
       setTimeout(() => {
-        _this.finishedLoading(true);
+        scope.finishedLoading(true);
       }, 2000);
     }
   }
@@ -456,10 +459,11 @@ export default class {
   asyncComplete(file, errorMessage = '') {
     file.loaded = true;
     file.error = !!errorMessage;
-    if (errorMessage) {
+    if (file.error) {
       file.errorMessage = errorMessage;
       console.warn(file, errorMessage);
     }
+    this.log('asyncComplete', file);
     this.processLoadQueue();
   }
 
@@ -552,7 +556,8 @@ export default class {
   }
 
   loadImageTag(file) {
-    const _this = this;
+    this.log('loadImageTag', file);
+    const scope = this;
     file.data = new Image();
     file.data.name = file.key;
     if (this.crossOrigin) {
@@ -562,20 +567,24 @@ export default class {
       if (file.data.onload) {
         file.data.onload = null;
         file.data.onerror = null;
-        _this.fileComplete(file);
+        scope.fileComplete(file);
       }
     };
     file.data.onerror = () => {
-      if (file.data.onload) {
+      if (scope.isUseRetry && (!file.numRetry || file.numRetry < scope.maxRetry)) {
+        file.numRetry = !file.numRetry ? 1 : file.numRetry += 1;
+        scope.loadImageTag(file);
+      } else if (file.data.onload) {
         file.data.onload = null;
         file.data.onerror = null;
-        _this.fileError(file);
+        scope.fileError(file);
       }
     };
     file.data.src = this.transformUrl(file.url, file);
   }
 
   xhrLoad(file, url, type, onload, onerror) {
+    this.log('xhrLoad', file);
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
     xhr.responseType = type;
@@ -605,13 +614,18 @@ export default class {
       return null;
     };
     xhr.onerror = () => {
-      try {
-        return onerror.call(scope, file, xhr);
-      } catch (e) {
-        if (!scope.hasLoaded) {
-          scope.asyncComplete(file, e.message || 'Exception');
-        } else {
-          scope.game.exceptionHandler(e);
+      if (scope.isUseRetry && (!file.numRetry || file.numRetry < scope.maxRetry)) {
+        file.numRetry = !file.numRetry ? 1 : file.numRetry += 1;
+        scope.xhrLoad(file, url, type, onload, onerror);
+      } else {
+        try {
+          return onerror.call(scope, file, xhr);
+        } catch (e) {
+          if (!scope.hasLoaded) {
+            scope.asyncComplete(file, e.message || 'Exception');
+          } else {
+            scope.game.exceptionHandler(e);
+          }
         }
       }
       return null;
@@ -814,6 +828,13 @@ export default class {
     }
   }
 
+  log(message, data = '') {
+    if (!this.isUseLog) {
+      return;
+    }
+    console.log(`[Loader] ${message}`, data);
+  }
+
   totalLoadedFiles() {
     return this._loadedFileCount;
   }