@eva/plugin-sound 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/plugin-sound.esm.js

@@ -1,4 +1,6 @@
 import { System, decorators, OBSERVER_TYPE, resource, Component } from '@eva/eva.js';
+import { sound, utils, soundAsset } from '@ali/pixi-sound';
+import { extensions } from 'pixi.js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -31,69 +33,31 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+sound.disableAutoPause = true;
+utils.extensions.push('aac');
+utils.validateFormats({
+    aac: 'audio/aac',
+});
+extensions.add(soundAsset);
 let SoundSystem = class SoundSystem extends System {
     constructor(obj) {
         super();
         this.autoPauseAndStart = true;
         this.components = [];
-        this.pausedComponents = [];
         this.audioBufferCache = {};
-        this.decodeAudioPromiseMap = {};
         Object.assign(this, obj);
-    }
-    get muted() {
-        return this.gainNode ? this.gainNode.gain.value === 0 : false;
-    }
-    set muted(v) {
-        if (!this.gainNode) {
-            return;
-        }
-        this.gainNode.gain.setValueAtTime(v ? 0 : 1, 0);
-    }
-    get volume() {
-        return this.gainNode ? this.gainNode.gain.value : 1;
-    }
-    set volume(v) {
-        if (!this.gainNode || typeof v !== 'number' || v < 0 || v > 1) {
-            return;
-        }
-        this.gainNode.gain.setValueAtTime(v, 0);
-    }
-    get audioLocked() {
-        if (!this.ctx) {
-            return true;
+        if (obj === null || obj === void 0 ? void 0 : obj.useLegacy) {
+            sound.useLegacy = true;
         }
-        return this.ctx.state !== 'running';
     }
     resumeAll() {
-        const handleResume = () => {
-            this.pausedComponents.forEach(component => {
-                component.play();
-            });
-            this.pausedComponents = [];
-        };
-        this.ctx.resume().then(handleResume, handleResume);
+        sound.resumeAll();
     }
     pauseAll() {
-        this.components.forEach(component => {
-            if (component.playing) {
-                this.pausedComponents.push(component);
-                component.pause();
-            }
-        });
-        this.ctx.suspend().then();
+        sound.pauseAll();
     }
     stopAll() {
-        this.components.forEach(component => {
-            if (component.playing) {
-                component.stop();
-            }
-        });
-        this.pausedComponents = [];
-        this.ctx.suspend().then();
-    }
-    init() {
-        this.setupAudioContext();
+        sound.stopAll();
     }
     update() {
         const changes = this.componentObserver.clear();
@@ -118,12 +82,7 @@ let SoundSystem = class SoundSystem extends System {
             component.onDestroy();
         });
         this.components = [];
-        if (this.ctx) {
-            this.gainNode.disconnect();
-            this.gainNode = null;
-            this.ctx.close();
-            this.ctx = null;
-        }
+        sound.removeAll();
     }
     componentChanged(changed) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -134,46 +93,8 @@ let SoundSystem = class SoundSystem extends System {
             }
         });
     }
-    setupAudioContext() {
-        try {
-            const AudioContext = window.AudioContext || window.webkitAudioContext;
-            this.ctx = new AudioContext();
-        }
-        catch (error) {
-            console.error(error);
-            if (this.onError) {
-                this.onError(error);
-            }
-        }
-        if (!this.ctx) {
-            return;
-        }
-        this.gainNode =
-            typeof this.ctx.createGain === 'undefined' ? this.ctx.createGainNode() : this.ctx.createGain();
-        this.gainNode.gain.setValueAtTime(this.muted ? 0 : this.volume, this.ctx.currentTime);
-        this.gainNode.connect(this.ctx.destination);
-        this.unlockAudio();
-    }
-    unlockAudio() {
-        if (!this.ctx || !this.audioLocked) {
-            return;
-        }
-        const unlock = () => {
-            if (this.ctx) {
-                const removeListenerFn = () => {
-                    document.body.removeEventListener('touchstart', unlock);
-                    document.body.removeEventListener('touchend', unlock);
-                    document.body.removeEventListener('click', unlock);
-                };
-                this.ctx.resume().then(removeListenerFn, removeListenerFn);
-            }
-        };
-        document.body.addEventListener('touchstart', unlock);
-        document.body.addEventListener('touchend', unlock);
-        document.body.addEventListener('click', unlock);
-    }
     add(changed) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const component = changed.component;
             this.components.push(component);
@@ -182,11 +103,9 @@ let SoundSystem = class SoundSystem extends System {
                 component.state = 'loading';
                 const audio = yield resource.getResource(config.resource);
                 if (!this.audioBufferCache[audio.name] && ((_a = audio === null || audio === void 0 ? void 0 : audio.data) === null || _a === void 0 ? void 0 : _a.audio)) {
-                    this.audioBufferCache[audio.name] = yield this.decodeAudioData(audio.data.audio, audio.name);
+                    this.audioBufferCache[audio.name] = (_b = audio === null || audio === void 0 ? void 0 : audio.data) === null || _b === void 0 ? void 0 : _b.audio;
                 }
                 if (this.audioBufferCache[audio.name]) {
-                    component.systemContext = this.ctx;
-                    component.systemDestination = this.gainNode;
                     component.onload(this.audioBufferCache[audio.name]);
                 }
             }
@@ -197,41 +116,6 @@ let SoundSystem = class SoundSystem extends System {
             }
         });
     }
-    decodeAudioData(arraybuffer, name) {
-        if (this.decodeAudioPromiseMap[name]) {
-            return this.decodeAudioPromiseMap[name];
-        }
-        const promise = new Promise((resolve, reject) => {
-            if (!this.ctx) {
-                reject(new Error('No audio support'));
-            }
-            const success = (decodedData) => {
-                if (this.decodeAudioPromiseMap[name]) {
-                    delete this.decodeAudioPromiseMap[name];
-                }
-                if (decodedData) {
-                    resolve(decodedData);
-                }
-                else {
-                    reject(new Error(`Error decoding audio ${name}`));
-                }
-            };
-            const error = (err) => {
-                if (this.decodeAudioPromiseMap[name]) {
-                    delete this.decodeAudioPromiseMap[name];
-                }
-                reject(new Error(`${err}. arrayBuffer byteLength: ${arraybuffer ? arraybuffer.byteLength : 0}`));
-            };
-            const promise = this.ctx.decodeAudioData(arraybuffer, success, error);
-            if (promise instanceof Promise) {
-                promise.catch(err => {
-                    reject(new Error(`catch ${err}, arrayBuffer byteLength: ${arraybuffer ? arraybuffer.byteLength : 0}`));
-                });
-            }
-        });
-        this.decodeAudioPromiseMap[name] = promise;
-        return promise;
-    }
 };
 SoundSystem.systemName = 'SoundSystem';
 SoundSystem = __decorate([
@@ -252,33 +136,34 @@ class Sound extends Component {
             volume: 1,
             loop: false,
             seek: 0,
+            speed: 1,
         };
-        this.playTime = 0;
-        this.startTime = 0;
-        this.duration = 0;
         this.actionQueue = [];
+        this.startTime = 0;
+    }
+    get systemContext() {
+        return sound.context.audioContext;
+    }
+    get playing() {
+        if (!this.buffer)
+            return false;
+        return this.buffer.isPlaying;
     }
     get muted() {
-        return this.gainNode ? this.gainNode.gain.value === 0 : false;
+        var _a;
+        return ((_a = this.buffer) === null || _a === void 0 ? void 0 : _a.muted) || false;
     }
     set muted(v) {
-        if (!this.gainNode) {
-            return;
-        }
-        this.gainNode.gain.setValueAtTime(v ? 0 : this.config.volume, 0);
+        if (this.buffer)
+            this.buffer.muted = v;
     }
     get volume() {
-        return this.gainNode ? this.gainNode.gain.value : 1;
+        var _a;
+        return ((_a = this.buffer) === null || _a === void 0 ? void 0 : _a.volume) || 0;
     }
     set volume(v) {
-        if (typeof v !== 'number' || v < 0 || v > 1) {
-            return;
-        }
-        this.config.volume = v;
-        if (!this.gainNode) {
-            return;
-        }
-        this.gainNode.gain.setValueAtTime(v, 0);
+        if (this.buffer)
+            this.buffer.volume = v;
     }
     init(obj) {
         if (!obj) {
@@ -293,101 +178,43 @@ class Sound extends Component {
         if (this.state !== 'loaded') {
             this.actionQueue.push(this.play.bind(this));
         }
-        this.destroySource();
-        this.createSource();
-        if (!this.sourceNode) {
+        if (!this.buffer)
             return;
-        }
-        const when = this.systemContext.currentTime;
-        const offset = this.config.seek;
-        const duration = this.config.duration;
-        this.sourceNode.start(0, offset, duration);
-        this.startTime = when;
-        this.playTime = when - offset;
-        this.paused = false;
-        this.playing = true;
-        this.resetConfig();
-        this.endedListener = () => {
-            if (!this.sourceNode) {
-                return;
-            }
-            if (this.config.onEnd) {
-                this.config.onEnd();
-            }
-            if (this.playing) {
-                this.destroySource();
-            }
-        };
-        this.sourceNode.addEventListener('ended', this.endedListener);
+        this.startTime = this.systemContext.currentTime;
+        this.buffer.play();
+    }
+    resume() {
+        if (!this.buffer)
+            return;
+        this.buffer.resume();
     }
     pause() {
-        if (this.state !== 'loaded') {
-            this.actionQueue.push(this.pause.bind(this));
-        }
-        if (this.paused || !this.playing) {
+        if (!this.buffer)
             return;
-        }
-        this.paused = true;
-        this.playing = false;
-        this.config.seek = this.getCurrentTime();
-        this.destroySource();
+        this.buffer.pause();
     }
     stop() {
-        if (this.state !== 'loaded') {
-            this.actionQueue.push(this.stop.bind(this));
-        }
-        if (!this.paused && !this.playing) {
+        if (!this.buffer)
             return;
-        }
-        this.playing = false;
-        this.paused = false;
-        this.destroySource();
-        this.resetConfig();
+        this.buffer.stop();
     }
     onload(buffer) {
         this.state = 'loaded';
         this.buffer = buffer;
-        this.duration = this.buffer.duration;
+        this.buffer.muted = this.config.muted;
+        this.buffer.volume = this.config.volume;
+        this.buffer.loop = this.config.loop;
+        this.buffer.speed = this.config.speed;
         this.actionQueue.forEach(action => action());
         this.actionQueue.length = 0;
     }
     onDestroy() {
         this.actionQueue.length = 0;
-        this.destroySource();
-    }
-    resetConfig() {
-        this.config.seek = 0;
-    }
-    getCurrentTime() {
-        if (this.config.loop && this.duration > 0) {
-            return (this.systemContext.currentTime - this.playTime) % this.duration;
-        }
-        return this.systemContext.currentTime - this.playTime;
-    }
-    createSource() {
-        if (!this.systemContext || this.state !== 'loaded') {
-            return;
-        }
-        this.sourceNode = this.systemContext.createBufferSource();
-        this.sourceNode.buffer = this.buffer;
-        this.sourceNode.loop = this.config.loop;
-        if (!this.gainNode) {
-            this.gainNode = this.systemContext.createGain();
-            this.gainNode.connect(this.systemDestination);
-            Object.assign(this, this.config);
-        }
-        this.sourceNode.connect(this.gainNode);
-    }
-    destroySource() {
-        if (!this.sourceNode)
-            return;
-        this.sourceNode.removeEventListener('ended', this.endedListener);
-        this.sourceNode.stop();
-        this.sourceNode.disconnect();
-        this.sourceNode = null;
         this.startTime = 0;
-        this.playTime = 0;
-        this.playing = false;
+        if (this.buffer) {
+            this.buffer.destroy();
+            this.buffer = null;
+        }
     }
 }
 Sound.componentName = 'Sound';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-sound",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "description": "@eva/plugin-sound",
   "main": "index.js",
   "module": "dist/plugin-sound.esm.js",
@@ -18,7 +18,9 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/eva.js": "2.0.0-beta.2",
-    "eventemitter3": "^3.1.2"
+    "@eva/eva.js": "2.0.0-beta.21",
+    "eventemitter3": "^3.1.2",
+    "pixi.js": "^8.8.1",
+    "@ali/pixi-sound": "^6.0.3"
   }
 }