@vpmedia/phaser 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "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",
@@ -26,12 +26,12 @@
     "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^27.1.5",
-    "eslint-plugin-jsdoc": "^39.6.2",
+    "eslint-plugin-jest": "^27.1.6",
+    "eslint-plugin-jsdoc": "^39.6.4",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.2",
     "jest": "^29.3.1",
-    "lint-staged": "^13.0.3",
+    "lint-staged": "^13.0.4",
     "prettier": "^2.8.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^4.10.0"

package/src/phaser/core/cache.js

@@ -137,7 +137,7 @@ export default class {
       data,
       isDecoding: false,
       decoded: false,
-      locked: this.game.sound.touchLocked,
+      locked: this.game.sound.isLocked,
     };
     this._resolveURL(url, this._cache.sound[key]);
   }
@@ -222,7 +222,7 @@ export default class {
   isSoundReady(key) {
     const sound = this.getItem(key, SOUND, 'isSoundDecoded');
     if (sound) {
-      return (sound.decoded && !this.game.sound.touchLocked);
+      return (sound.decoded && !this.game.sound.isLocked);
     }
     return false;
   }

package/src/phaser/core/sound_manager.js

@@ -19,7 +19,7 @@ export default class {
     this.baseLatency = 0; // https://developer.mozilla.org/en-US/docs/Web/API/AudioContext/baseLatency
     this.noAudio = false;
     this.connectToMaster = true;
-    this.touchLocked = false;
+    this.isLocked = false;
     this.muteOnPause = true;
     this._codeMuted = false;
     this._muted = false;
@@ -45,7 +45,7 @@ export default class {
       } catch (e) {
         this.context = null;
         this.noAudio = true;
-        this.touchLocked = false;
+        this.isLocked = false;
         this.game.exceptionHandler(e);
       }
     } else if (window.webkitAudioContext) {
@@ -54,72 +54,61 @@ export default class {
       } catch (e) {
         this.context = null;
         this.noAudio = true;
-        this.touchLocked = false;
+        this.isLocked = false;
         this.game.exceptionHandler(e);
       }
     }
     if (this.context === null || (this.context && this.context.createGain === undefined && this.context.createGainNode === undefined)) {
       this.noAudio = true;
-    } else {
-      this.baseLatency = this.context.baseLatency || (256 / (this.context.sampleRate || 44100));
-      if (this.context.createGain === undefined) {
-        this.masterGain = this.context.createGainNode();
-      } else {
-        this.masterGain = this.context.createGain();
-      }
-      this.masterGain.gain.value = 1;
-      this.masterGain.connect(this.context.destination);
-    }
-    if (this.noAudio) {
       return;
-    }
-    if (this.game.device.iOS || this.game.device.android) {
-      this.game.input.addTouchLockCallback(this.unlock, this, true);
-      this.touchLocked = true;
+    } 
+    this.baseLatency = this.context.baseLatency || (256 / (this.context.sampleRate || 44100));
+    if (this.context.createGain === undefined) {
+      this.masterGain = this.context.createGainNode();
+    } else {
+      this.masterGain = this.context.createGain();
+    }
+    this.masterGain.gain.value = 1;
+    this.masterGain.connect(this.context.destination);
+    // handle audio context state
+    this.context.onstatechange = () => {
+      console.log("AudioContext", this.context.state);
+    };
+    if (this.context.state === 'suspended') {
+      this.isLocked = true;
+      this.onUnlockEventBinded = this.onUnlockEvent.bind(this);
+      this.addUnlockHandlers();
     }
   }
 
-  checkContextState() {
-    // this must be called from the final game state since input.onUp handlers are reset by state manager
-    if (this.noAudio) {
-      return;
-    }
-    if (this.game.device.iOS || this.game.device.android) {
-      // touch lock callback already handles context resume
+  addUnlockHandlers() {
+    document.body.addEventListener('touchstart', this.onUnlockEventBinded, false);
+    document.body.addEventListener('touchend', this.onUnlockEventBinded, false);
+    document.body.addEventListener('click', this.onUnlockEventBinded, false);
+    document.body.addEventListener('keydown', this.onUnlockEventBinded, false);
+  }
+
+  removeUnlockHandlers() {
+    document.body.removeEventListener('touchstart', this.onUnlockEventBinded);
+    document.body.removeEventListener('touchend', this.onUnlockEventBinded);
+    document.body.removeEventListener('click', this.onUnlockEventBinded);
+    document.body.removeEventListener('keydown', this.onUnlockEventBinded);
+  }
+
+  onUnlockEvent(event) {
+    if (this.context.state !== 'suspended') {
       return;
     }
-    if (this.context.state === 'suspended') {
-      this.game.input.onUp.addOnce(() => {
-        if (this.context.state === 'suspended') {
-          this.context.resume().catch((e) => {
-            this.game.exceptionHandler(e, { state: this.context.state, trigger: 'check' });
-          });
-        }
-      }, this);
-    }
+    console.log('onUnlockEvent', event);
+    this.context.resume().then(() => {
+      this.removeUnlockHandlers();
+    }).catch((e) => {
+      this.removeUnlockHandlers();
+      this.game.exceptionHandler(e, { state: this.context.state });
+    });
   }
 
-  unlock() {
-    if (!this.touchLocked || this._unlockSource !== null) {
-      return true;
-    }
-    // Create empty buffer and play it
-    // The SoundManager.update loop captures the state of it and then resets touchLocked to false
-    const buffer = this.context.createBuffer(1, 1, 22050);
-    this._unlockSource = this.context.createBufferSource();
-    this._unlockSource.buffer = buffer;
-    this._unlockSource.connect(this.context.destination);
-    if (this._unlockSource.start === undefined) {
-      this._unlockSource.noteOn(0);
-    } else {
-      this._unlockSource.start(0);
-    }
-    if (this.context.state === 'suspended') {
-      this.context.resume().catch((e) => {
-        this.game.exceptionHandler(e, { state: this.context.state, trigger: 'unlock' });
-      });
-    }
-    return true;
+  checkContextState() {
   }
 
   stopAll() {
@@ -201,19 +190,6 @@ export default class {
     if (this.noAudio) {
       return;
     }
-    if (this.touchLocked && this._unlockSource !== null && (this._unlockSource.playbackState === this._unlockSource.PLAYING_STATE || this._unlockSource.playbackState === this._unlockSource.FINISHED_STATE)) {
-      this.touchLocked = false;
-      this._unlockSource = null;
-      if (this.context.state === 'suspended') {
-        this.context.resume().catch((e) => {
-          this.game.exceptionHandler(e, { state: this.context.state, trigger: 'update' });
-        });
-      }
-    } else if (this.context.state === 'interrupted') {
-      this.context.resume().catch((e) => {
-        this.game.exceptionHandler(e, { state: this.context.state });
-      });
-    }
     for (let i = 0; i < this._sounds.length; i += 1) {
       this._sounds[i].update();
     }