@eva/plugin-sound 2.0.0-beta.1 → 2.0.0-beta.11

package/dist/plugin-sound.esm.js

@@ -1,4 +1,6 @@
-import { decorators, System, OBSERVER_TYPE, resource, Component } from '@eva/eva.js';
+import { System, decorators, OBSERVER_TYPE, resource, Component } from '@eva/eva.js';
+import { soundAsset, sound } from '@pixi/sound';
+import { extensions } from 'pixi.js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -14,20 +16,6 @@ MERCHANTABLITY OR NON-INFRINGEMENT.
 See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
 
 function __decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -43,357 +31,133 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-}
-
-function __values(o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
 }
 
-var SoundSystem = (function (_super) {
-    __extends(SoundSystem, _super);
-    function SoundSystem(obj) {
-        var _this = _super.call(this) || this;
-        _this.autoPauseAndStart = true;
-        _this.components = [];
-        _this.pausedComponents = [];
-        _this.audioBufferCache = {};
-        _this.decodeAudioPromiseMap = {};
-        Object.assign(_this, obj);
-        return _this;
+extensions.add(soundAsset);
+let SoundSystem = class SoundSystem extends System {
+    constructor(obj) {
+        super();
+        this.autoPauseAndStart = true;
+        this.components = [];
+        this.audioBufferCache = {};
+        Object.assign(this, obj);
     }
-    Object.defineProperty(SoundSystem.prototype, "muted", {
-        get: function () {
-            return this.gainNode ? this.gainNode.gain.value === 0 : false;
-        },
-        set: function (v) {
-            if (!this.gainNode) {
-                return;
-            }
-            this.gainNode.gain.setValueAtTime(v ? 0 : 1, 0);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(SoundSystem.prototype, "volume", {
-        get: function () {
-            return this.gainNode ? this.gainNode.gain.value : 1;
-        },
-        set: function (v) {
-            if (!this.gainNode || typeof v !== 'number' || v < 0 || v > 1) {
-                return;
-            }
-            this.gainNode.gain.setValueAtTime(v, 0);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(SoundSystem.prototype, "audioLocked", {
-        get: function () {
-            if (!this.ctx) {
-                return true;
-            }
-            return this.ctx.state !== 'running';
-        },
-        enumerable: false,
-        configurable: true
-    });
-    SoundSystem.prototype.resumeAll = function () {
-        var _this = this;
-        var handleResume = function () {
-            _this.pausedComponents.forEach(function (component) {
-                component.play();
-            });
-            _this.pausedComponents = [];
-        };
-        this.ctx.resume().then(handleResume, handleResume);
-    };
-    SoundSystem.prototype.pauseAll = function () {
-        var _this = this;
-        this.components.forEach(function (component) {
-            if (component.playing) {
-                _this.pausedComponents.push(component);
-                component.pause();
-            }
-        });
-        this.ctx.suspend().then();
-    };
-    SoundSystem.prototype.stopAll = function () {
-        this.components.forEach(function (component) {
-            if (component.playing) {
-                component.stop();
-            }
-        });
-        this.pausedComponents = [];
-        this.ctx.suspend().then();
-    };
-    SoundSystem.prototype.init = function () {
-        this.setupAudioContext();
-    };
-    SoundSystem.prototype.update = function () {
-        var e_1, _a;
-        var changes = this.componentObserver.clear();
-        try {
-            for (var changes_1 = __values(changes), changes_1_1 = changes_1.next(); !changes_1_1.done; changes_1_1 = changes_1.next()) {
-                var changed = changes_1_1.value;
-                this.componentChanged(changed);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (changes_1_1 && !changes_1_1.done && (_a = changes_1.return)) _a.call(changes_1);
-            }
-            finally { if (e_1) throw e_1.error; }
+    resumeAll() {
+        sound.resumeAll();
+    }
+    pauseAll() {
+        sound.pauseAll();
+    }
+    stopAll() {
+        sound.stopAll();
+    }
+    update() {
+        const changes = this.componentObserver.clear();
+        for (const changed of changes) {
+            this.componentChanged(changed);
         }
-    };
-    SoundSystem.prototype.onResume = function () {
+    }
+    onResume() {
         if (!this.autoPauseAndStart) {
             return;
         }
         this.resumeAll();
-    };
-    SoundSystem.prototype.onPause = function () {
+    }
+    onPause() {
         if (!this.autoPauseAndStart) {
             return;
         }
         this.pauseAll();
-    };
-    SoundSystem.prototype.onDestroy = function () {
-        this.components.forEach(function (component) {
+    }
+    onDestroy() {
+        this.components.forEach(component => {
             component.onDestroy();
         });
         this.components = [];
-        if (this.ctx) {
-            this.gainNode.disconnect();
-            this.gainNode = null;
-            this.ctx.close();
-            this.ctx = null;
-        }
-    };
-    SoundSystem.prototype.componentChanged = function (changed) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                if (changed.componentName !== 'Sound')
-                    return [2];
-                if (changed.type === OBSERVER_TYPE.ADD) {
-                    this.add(changed);
-                }
-                return [2];
-            });
-        });
-    };
-    SoundSystem.prototype.setupAudioContext = function () {
-        try {
-            var AudioContext_1 = window.AudioContext || window.webkitAudioContext;
-            this.ctx = new AudioContext_1();
-        }
-        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();
-    };
-    SoundSystem.prototype.unlockAudio = function () {
-        var _this = this;
-        if (!this.ctx || !this.audioLocked) {
-            return;
-        }
-        var unlock = function () {
-            if (_this.ctx) {
-                var removeListenerFn = function () {
-                    document.body.removeEventListener('touchstart', unlock);
-                    document.body.removeEventListener('touchend', unlock);
-                    document.body.removeEventListener('click', unlock);
-                };
-                _this.ctx.resume().then(removeListenerFn, removeListenerFn);
+        sound.removeAll();
+    }
+    componentChanged(changed) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (changed.componentName !== 'Sound')
+                return;
+            if (changed.type === OBSERVER_TYPE.ADD) {
+                this.add(changed);
             }
-        };
-        document.body.addEventListener('touchstart', unlock);
-        document.body.addEventListener('touchend', unlock);
-        document.body.addEventListener('click', unlock);
-    };
-    SoundSystem.prototype.add = function (changed) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var component, config, audio, _b, _c, error_1;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        component = changed.component;
-                        this.components.push(component);
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 5, , 6]);
-                        config = component.config;
-                        component.state = 'loading';
-                        return [4, resource.getResource(config.resource)];
-                    case 2:
-                        audio = _d.sent();
-                        if (!(!this.audioBufferCache[audio.name] && ((_a = audio === null || audio === void 0 ? void 0 : audio.data) === null || _a === void 0 ? void 0 : _a.audio))) return [3, 4];
-                        _b = this.audioBufferCache;
-                        _c = audio.name;
-                        return [4, this.decodeAudioData(audio.data.audio, audio.name)];
-                    case 3:
-                        _b[_c] = _d.sent();
-                        _d.label = 4;
-                    case 4:
-                        if (this.audioBufferCache[audio.name]) {
-                            component.systemContext = this.ctx;
-                            component.systemDestination = this.gainNode;
-                            component.onload(this.audioBufferCache[audio.name]);
-                        }
-                        return [3, 6];
-                    case 5:
-                        error_1 = _d.sent();
-                        if (this.onError) {
-                            this.onError(error_1);
-                        }
-                        return [3, 6];
-                    case 6: return [2];
-                }
-            });
         });
-    };
-    SoundSystem.prototype.decodeAudioData = function (arraybuffer, name) {
-        var _this = this;
-        if (this.decodeAudioPromiseMap[name]) {
-            return this.decodeAudioPromiseMap[name];
-        }
-        var promise = new Promise(function (resolve, reject) {
-            if (!_this.ctx) {
-                reject(new Error('No audio support'));
-            }
-            var success = function (decodedData) {
-                if (_this.decodeAudioPromiseMap[name]) {
-                    delete _this.decodeAudioPromiseMap[name];
-                }
-                if (decodedData) {
-                    resolve(decodedData);
+    }
+    add(changed) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const component = changed.component;
+            this.components.push(component);
+            try {
+                const { config } = component;
+                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] = (_b = audio === null || audio === void 0 ? void 0 : audio.data) === null || _b === void 0 ? void 0 : _b.audio;
                 }
-                else {
-                    reject(new Error("Error decoding audio " + name));
+                if (this.audioBufferCache[audio.name]) {
+                    component.onload(this.audioBufferCache[audio.name]);
                 }
-            };
-            var error = function (err) {
-                if (_this.decodeAudioPromiseMap[name]) {
-                    delete _this.decodeAudioPromiseMap[name];
+            }
+            catch (error) {
+                if (this.onError) {
+                    this.onError(error);
                 }
-                reject(new Error(err + ". arrayBuffer byteLength: " + (arraybuffer ? arraybuffer.byteLength : 0)));
-            };
-            var promise = _this.ctx.decodeAudioData(arraybuffer, success, error);
-            if (promise instanceof Promise) {
-                promise.catch(function (err) {
-                    reject(new Error("catch " + err + ", arrayBuffer byteLength: " + (arraybuffer ? arraybuffer.byteLength : 0)));
-                });
             }
         });
-        this.decodeAudioPromiseMap[name] = promise;
-        return promise;
-    };
-    SoundSystem.systemName = 'SoundSystem';
-    SoundSystem = __decorate([
-        decorators.componentObserver({
-            Sound: [],
-        })
-    ], SoundSystem);
-    return SoundSystem;
-}(System));
+    }
+};
+SoundSystem.systemName = 'SoundSystem';
+SoundSystem = __decorate([
+    decorators.componentObserver({
+        Sound: [],
+    })
+], SoundSystem);
 var SoundSystem$1 = SoundSystem;
 
-var Sound = (function (_super) {
-    __extends(Sound, _super);
-    function Sound() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.state = 'unloaded';
-        _this.config = {
+class Sound extends Component {
+    constructor() {
+        super(...arguments);
+        this.state = 'unloaded';
+        this.config = {
             resource: '',
             autoplay: false,
             muted: false,
             volume: 1,
             loop: false,
             seek: 0,
+            speed: 1,
         };
-        _this.playTime = 0;
-        _this.startTime = 0;
-        _this.duration = 0;
-        _this.actionQueue = [];
-        return _this;
+        this.actionQueue = [];
+        this.startTime = 0;
     }
-    Object.defineProperty(Sound.prototype, "muted", {
-        get: function () {
-            return this.gainNode ? this.gainNode.gain.value === 0 : false;
-        },
-        set: function (v) {
-            if (!this.gainNode) {
-                return;
-            }
-            this.gainNode.gain.setValueAtTime(v ? 0 : this.config.volume, 0);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Sound.prototype, "volume", {
-        get: function () {
-            return this.gainNode ? this.gainNode.gain.value : 1;
-        },
-        set: function (v) {
-            if (typeof v !== 'number' || v < 0 || v > 1) {
-                return;
-            }
-            this.config.volume = v;
-            if (!this.gainNode) {
-                return;
-            }
-            this.gainNode.gain.setValueAtTime(v, 0);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Sound.prototype.init = function (obj) {
+    get systemContext() {
+        return sound.context;
+    }
+    get playing() {
+        if (!this.buffer)
+            return false;
+        return this.buffer.isPlaying;
+    }
+    get muted() {
+        var _a;
+        return ((_a = this.buffer) === null || _a === void 0 ? void 0 : _a.muted) || false;
+    }
+    set muted(v) {
+        if (this.buffer)
+            this.buffer.muted = v;
+    }
+    get volume() {
+        var _a;
+        return ((_a = this.buffer) === null || _a === void 0 ? void 0 : _a.volume) || 0;
+    }
+    set volume(v) {
+        if (this.buffer)
+            this.buffer.volume = v;
+    }
+    init(obj) {
         if (!obj) {
             return;
         }
@@ -401,111 +165,51 @@ var Sound = (function (_super) {
         if (this.config.autoplay) {
             this.actionQueue.push(this.play.bind(this));
         }
-    };
-    Sound.prototype.play = function () {
-        var _this = this;
+    }
+    play() {
         if (this.state !== 'loaded') {
             this.actionQueue.push(this.play.bind(this));
         }
-        this.destroySource();
-        this.createSource();
-        if (!this.sourceNode) {
+        if (!this.buffer)
             return;
-        }
-        var when = this.systemContext.currentTime;
-        var offset = this.config.seek;
-        var 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 = function () {
-            if (!_this.sourceNode) {
-                return;
-            }
-            if (_this.config.onEnd) {
-                _this.config.onEnd();
-            }
-            if (_this.playing) {
-                _this.destroySource();
-            }
-        };
-        this.sourceNode.addEventListener('ended', this.endedListener);
-    };
-    Sound.prototype.pause = function () {
-        if (this.state !== 'loaded') {
-            this.actionQueue.push(this.pause.bind(this));
-        }
-        if (this.paused || !this.playing) {
+        this.startTime = this.systemContext.currentTime;
+        this.buffer.play();
+    }
+    resume() {
+        if (!this.buffer)
             return;
-        }
-        this.paused = true;
-        this.playing = false;
-        this.config.seek = this.getCurrentTime();
-        this.destroySource();
-    };
-    Sound.prototype.stop = function () {
-        if (this.state !== 'loaded') {
-            this.actionQueue.push(this.stop.bind(this));
-        }
-        if (!this.paused && !this.playing) {
+        this.buffer.resume();
+    }
+    pause() {
+        if (!this.buffer)
             return;
-        }
-        this.playing = false;
-        this.paused = false;
-        this.destroySource();
-        this.resetConfig();
-    };
-    Sound.prototype.onload = function (buffer) {
+        this.buffer.pause();
+    }
+    stop() {
+        if (!this.buffer)
+            return;
+        this.buffer.stop();
+    }
+    onload(buffer) {
         this.state = 'loaded';
         this.buffer = buffer;
-        this.duration = this.buffer.duration;
-        this.actionQueue.forEach(function (action) { return action(); });
+        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;
-    };
-    Sound.prototype.onDestroy = function () {
+    }
+    onDestroy() {
         this.actionQueue.length = 0;
-        this.destroySource();
-    };
-    Sound.prototype.resetConfig = function () {
-        this.config.seek = 0;
-    };
-    Sound.prototype.getCurrentTime = function () {
-        if (this.config.loop && this.duration > 0) {
-            return (this.systemContext.currentTime - this.playTime) % this.duration;
-        }
-        return this.systemContext.currentTime - this.playTime;
-    };
-    Sound.prototype.createSource = function () {
-        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);
-    };
-    Sound.prototype.destroySource = function () {
-        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;
-    };
-    Sound.componentName = 'Sound';
-    return Sound;
-}(Component));
+        if (this.buffer) {
+            this.buffer.destroy();
+            this.buffer = null;
+        }
+    }
+}
+Sound.componentName = 'Sound';
 var Sound$1 = Sound;
 
 export { Sound$1 as Sound, SoundSystem$1 as SoundSystem };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-sound",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.11",
   "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.1",
-    "eventemitter3": "^3.1.2"
+    "@eva/eva.js": "2.0.0-beta.11",
+    "eventemitter3": "^3.1.2",
+    "pixi.js": "^8.6.5",
+    "@pixi/sound": "^6.0.1"
   }
 }