@urso/core 0.2.5 → 0.3.0

package/src/js/modules/soundManager/controller.js

@@ -1,99 +1,99 @@
-class SoundManagerController {
-    constructor() {
-        this._systemVolume = 1;
-        this._globalVolume = 0;
-
-        this._howler = null;
-        this._codecsToCheck = ['ogg', 'm4a', 'mp3', 'wav'];
-        this._selectedCodec = null;
-        this._sounds = {};
-
-        this._setCodec();
-
-        this._updateSoundsCfgHandler = this._updateSoundsCfgHandler.bind(this);
-        this._doHandler = this._doHandler.bind(this);
-    }
-
-    _setCodec() {
-        for (const codec of this._codecsToCheck) {
-            if (Howler.Howler.codecs(codec)) {
-                this._selectedCodec = codec;
-                return;
-            }
-        }
-    };
-
-    _createSounds(soundData) {
-        const { eventsCfg, sounds } = soundData;
-
-        for (const soundKey in sounds) {
-
-            if (this._sounds[soundKey])
-                continue;
-
-            const { audiosprite, json } = sounds[soundKey];
-
-            const soundSptite = this.getInstance('SoundSprite', {
-                sprite: json.sprite,
-                name: soundKey,
-                audiosprite
-            });
-
-            this._sounds[soundKey] = soundSptite;
-
-            soundSptite.updateEvents(eventsCfg);
-        }
-    };
-
-    _setEventsHandler() {
-        const soundsCfg = Urso.localData.get('sounds.cfg') || {};
-
-        for (const key in this._sounds)
-            if (soundsCfg[key])
-                this._sounds[key].updateEvents(soundsCfg[key]);
-    };
-
-    _checkSoundExists(name) {
-        if (this._sounds[name])
-            return true;
-
-        Urso.logger.error(`Sound with key ${name} wasn't found!`);
-    };
-
-    _updateSoundsCfgHandler(soundsCfg) {
-        this._createSounds(soundsCfg);
-    };
-
-    _doHandler({ action, name, behavior }) {
-        if (this._checkSoundExists(name))
-            this._sounds[name][action](behavior);
-    };
-
-    /**
-     * 
-     * @param {Number} volume (0-1)
-     */
-    _globalVolumeChange(volume) {
-        this._globalVolume = Urso.math.intMakeBetween(volume, 0, 1);
-        this._updateSoundVolume();
-    }
-
-    _visibilityChange(state) {
-        this._systemVolume = ~~(state === 'visible');
-        this._updateSoundVolume();
-    }
-    _updateSoundVolume() {
-        const totalVolume = this._globalVolume * this._systemVolume;
-        for (const key in this._sounds)
-            this._sounds[key].setAllVolume(totalVolume);
-    }
-
-    _subscribe() {
-        this.addListener(Urso.events.MODULES_SOUND_MANAGER_UPDATE_CFG, this._updateSoundsCfgHandler, true);
-        this.addListener(Urso.events.MODULES_LOGIC_SOUNDS_DO, this._doHandler, true);
-        this.addListener(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, this._globalVolumeChange.bind(this), true);
-        this.addListener(Urso.events.EXTRA_BROWSEREVENTS_WINDOW_VISIBILITYCHANGE, this._visibilityChange.bind(this), true);
-    };
-};
-
-module.exports = SoundManagerController;
+class SoundManagerController {
+    constructor() {
+        this._systemVolume = 1;
+        this._globalVolume = 0;
+
+        this._howler = null;
+        this._codecsToCheck = ['ogg', 'm4a', 'mp3', 'wav'];
+        this._selectedCodec = null;
+        this._sounds = {};
+
+        this._setCodec();
+
+        this._updateSoundsCfgHandler = this._updateSoundsCfgHandler.bind(this);
+        this._doHandler = this._doHandler.bind(this);
+    }
+
+    _setCodec() {
+        for (const codec of this._codecsToCheck) {
+            if (Howler.Howler.codecs(codec)) {
+                this._selectedCodec = codec;
+                return;
+            }
+        }
+    };
+
+    _createSounds(soundData) {
+        const { eventsCfg, sounds } = soundData;
+
+        for (const soundKey in sounds) {
+
+            if (this._sounds[soundKey])
+                continue;
+
+            const { audiosprite, json } = sounds[soundKey];
+
+            const soundSptite = this.getInstance('SoundSprite', {
+                sprite: json.sprite,
+                name: soundKey,
+                audiosprite
+            });
+
+            this._sounds[soundKey] = soundSptite;
+
+            soundSptite.updateEvents(eventsCfg);
+        }
+    };
+
+    _setEventsHandler() {
+        const soundsCfg = Urso.localData.get('sounds.cfg') || {};
+
+        for (const key in this._sounds)
+            if (soundsCfg[key])
+                this._sounds[key].updateEvents(soundsCfg[key]);
+    };
+
+    _checkSoundExists(name) {
+        if (this._sounds[name])
+            return true;
+
+        Urso.logger.error(`Sound with key ${name} wasn't found!`);
+    };
+
+    _updateSoundsCfgHandler(soundsCfg) {
+        this._createSounds(soundsCfg);
+    };
+
+    _doHandler({ action, name, behavior }) {
+        if (this._checkSoundExists(name))
+            this._sounds[name][action](behavior);
+    };
+
+    /**
+     * 
+     * @param {Number} volume (0-1)
+     */
+    _globalVolumeChange(volume) {
+        this._globalVolume = Urso.math.intMakeBetween(volume, 0, 1);
+        this._updateSoundVolume();
+    }
+
+    _visibilityChange(state) {
+        this._systemVolume = ~~(state === 'visible');
+        this._updateSoundVolume();
+    }
+    _updateSoundVolume() {
+        const totalVolume = this._globalVolume * this._systemVolume;
+        for (const key in this._sounds)
+            this._sounds[key].setAllVolume(totalVolume);
+    }
+
+    _subscribe() {
+        this.addListener(Urso.events.MODULES_SOUND_MANAGER_UPDATE_CFG, this._updateSoundsCfgHandler, true);
+        this.addListener(Urso.events.MODULES_LOGIC_SOUNDS_DO, this._doHandler, true);
+        this.addListener(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, this._globalVolumeChange.bind(this), true);
+        this.addListener(Urso.events.EXTRA_BROWSEREVENTS_WINDOW_VISIBILITYCHANGE, this._visibilityChange.bind(this), true);
+    };
+};
+
+module.exports = SoundManagerController;

package/src/js/modules/soundManager/soundSprite.js

@@ -1,203 +1,203 @@
-class SoundSprite {
-    constructor({ name, sprite, audiosprite }) {
-        this._player = null;
-        this._totalVolume = 0;
-        this._makePlayer(sprite, audiosprite);
-
-        this._name = name;
-        this._sprite = sprite;
-
-        this._soundsState = this._initSoundsState();
-
-        this._eventsCfg = {};
-        this._eventsQueue = [];
-        this._isAudioUnlocked = false;
-
-        this._reactToEvent = this._reactToEvent.bind(this);
-    };
-
-
-    _initSoundsState() {
-        const soundsNames = Object.keys(this._sprite);
-        const soundsStateObj = {};
-
-        soundsNames.forEach(soundName => {
-            soundsStateObj[soundName] = {
-                id: null,
-                loop: false,
-                volume: 1,
-                relaunch: false
-            }
-        });
-
-        return soundsStateObj;
-    }
-
-    _makePlayer(sprite, audiosprite) {
-        var reader = new FileReader();
-        reader.readAsDataURL(audiosprite);
-        reader.onloadend = () => {
-            var base64data = reader.result;
-            this._player = new Howl({
-                src: base64data,
-                sprite
-            });
-            this._subscribePlayerEvents();
-        }
-    };
-
-    _subscribePlayerEvents() {
-        this._player.on('unlock', () => setTimeout(() => {
-            this._isAudioUnlocked = true;
-            this._onUnlock();
-        }, 1000));
-
-        this._player.on('end', id => {
-            const soundState = this._getSoundStateById(id);
-
-            if (!soundState.loop)
-                soundState.id = null;
-        });
-    };
-
-    _getSoundStateById(id) {
-        for (const [name, state] of Object.entries(this._soundsState)) {
-            if (state.id === id) {
-                return {
-                    id: { ...state, name }
-                }
-            }
-        }
-    }
-
-    canPlayCheck() {
-        return this._isAudioUnlocked;
-    };
-
-    play({ loop = false, volume = this._volume, relaunch = false, soundKey }) {
-        if (!this.canPlayCheck() || (this._soundsState[soundKey].id !== null && !relaunch))
-            return false;
-
-        this.stop({ soundKey });
-
-        this._soundsState[soundKey].id = this._player.play(soundKey);
-
-        this.setRelaunch(soundKey, relaunch);
-        this.setLoop(soundKey, loop);
-        this.setVolume(soundKey, volume);
-
-        return true;
-    };
-
-    setLoop(soundKey, loop = false) {
-        this._soundsState[soundKey].loop = loop;
-        this._player.loop(loop, this._soundsState[soundKey].id);
-    };
-
-    setVolume(soundKey, volume = 1) {
-        this._soundsState[soundKey].volume = volume;
-
-        this._player.volume(volume, this._soundsState[soundKey].id);
-    };
-
-    setAllVolume(volume) {
-        this._totalVolume = volume;
-        this._player._volume = volume;
-
-        if (this.canPlayCheck()) {
-            this._updateVolume();
-        }
-    }
-
-    _updateVolume() {
-        const keys = Object.keys(this._soundsState);
-        this._player._volume = this._totalVolume;
-        keys.forEach(key => this.setVolume(key, this._totalVolume));
-    }
-
-    setRelaunch(soundKey, needRelaunch = false) {
-        this._soundsState[soundKey].relaunch = needRelaunch;
-    };
-
-    stop({ soundKey }) {
-        if (!this._soundsState[soundKey].id)
-            return;
-
-        this._player.stop(this._soundsState[soundKey].id);
-        this._soundsState[soundKey].id = null;
-    };
-
-    pause({ soundKey }) {
-        if (this.canPlayCheck() || this._player.playing(this._soundsState[soundKey].id))
-            this._player.pause(this._soundsState[soundKey].id);
-    };
-
-    resume({ soundKey }) {
-        if (this.canPlayCheck() && !this._player.playing(this._soundsState[soundKey].id))
-            this._player.play(this._soundsState[soundKey].id);
-    };
-
-    updateEvents(eventsCfg) {
-        this._customUnsubscribe();
-        this._saveEvents(eventsCfg);
-        this._customSubscribe();
-    };
-
-    _saveEvents(eventsCfg) {
-        this._eventsCfg = eventsCfg;
-    }
-
-    _setEventCallback(soundKey, event) {
-        return function () {
-            const params = this._eventsCfg[soundKey].events[event];
-
-            this._reactToEvent(soundKey, params);
-        };
-    };
-
-    _onUnlock() {
-        this._runEventsFromQueue();
-        this._updateVolume();
-    };
-
-    _runEventsFromQueue() {
-        this._eventsQueue.forEach(event => this._reactToEvent(event.soundKey, event));
-        this._eventsQueue = [];
-    };
-
-    _addEventToQueue(data) {
-        this._eventsQueue.push(data);
-    };
-
-    _reactToEvent(soundKey, { action, loop, relaunch, volume = 0 }) {
-        volume *= this._totalVolume;
-        const self = this;
-        const params = { loop, relaunch, volume, soundKey };
-
-        if (!self[action])
-            Urso.logger.error(`Sound action '${action}' not found!`);
-
-        if (!this._isAudioUnlocked)
-            this._addEventToQueue({ ...params, action });
-
-        self[action](params);
-    };
-
-    _customSubscribe() {
-        for (const soundKey in this._eventsCfg) {
-            const { events = {} } = this._eventsCfg[soundKey];
-
-            for (const event in events) {
-                this.addListener(event, this._setEventCallback(soundKey, event).bind(this), true);
-            }
-        }
-    };
-
-    _customUnsubscribe() {
-        for (const event in this._eventsCfg) {
-            this.removeListener(event, this._setEventCallback(event).bind(this), true);
-        }
-    };
-};
-
+class SoundSprite {
+    constructor({ name, sprite, audiosprite }) {
+        this._player = null;
+        this._totalVolume = 0;
+        this._makePlayer(sprite, audiosprite);
+
+        this._name = name;
+        this._sprite = sprite;
+
+        this._soundsState = this._initSoundsState();
+
+        this._eventsCfg = {};
+        this._eventsQueue = [];
+        this._isAudioUnlocked = false;
+
+        this._reactToEvent = this._reactToEvent.bind(this);
+    };
+
+
+    _initSoundsState() {
+        const soundsNames = Object.keys(this._sprite);
+        const soundsStateObj = {};
+
+        soundsNames.forEach(soundName => {
+            soundsStateObj[soundName] = {
+                id: null,
+                loop: false,
+                volume: 1,
+                relaunch: false
+            }
+        });
+
+        return soundsStateObj;
+    }
+
+    _makePlayer(sprite, audiosprite) {
+        var reader = new FileReader();
+        reader.readAsDataURL(audiosprite);
+        reader.onloadend = () => {
+            var base64data = reader.result;
+            this._player = new Howl({
+                src: base64data,
+                sprite
+            });
+            this._subscribePlayerEvents();
+        }
+    };
+
+    _subscribePlayerEvents() {
+        this._player.on('unlock', () => setTimeout(() => {
+            this._isAudioUnlocked = true;
+            this._onUnlock();
+        }, 1000));
+
+        this._player.on('end', id => {
+            const soundState = this._getSoundStateById(id);
+
+            if (!soundState.loop)
+                soundState.id = null;
+        });
+    };
+
+    _getSoundStateById(id) {
+        for (const [name, state] of Object.entries(this._soundsState)) {
+            if (state.id === id) {
+                return {
+                    id: { ...state, name }
+                }
+            }
+        }
+    }
+
+    canPlayCheck() {
+        return this._isAudioUnlocked;
+    };
+
+    play({ loop = false, volume = this._volume, relaunch = false, soundKey }) {
+        if (!this.canPlayCheck() || (this._soundsState[soundKey].id !== null && !relaunch))
+            return false;
+
+        this.stop({ soundKey });
+
+        this._soundsState[soundKey].id = this._player.play(soundKey);
+
+        this.setRelaunch(soundKey, relaunch);
+        this.setLoop(soundKey, loop);
+        this.setVolume(soundKey, volume);
+
+        return true;
+    };
+
+    setLoop(soundKey, loop = false) {
+        this._soundsState[soundKey].loop = loop;
+        this._player.loop(loop, this._soundsState[soundKey].id);
+    };
+
+    setVolume(soundKey, volume = 1) {
+        this._soundsState[soundKey].volume = volume;
+
+        this._player.volume(volume, this._soundsState[soundKey].id);
+    };
+
+    setAllVolume(volume) {
+        this._totalVolume = volume;
+        this._player._volume = volume;
+
+        if (this.canPlayCheck()) {
+            this._updateVolume();
+        }
+    }
+
+    _updateVolume() {
+        const keys = Object.keys(this._soundsState);
+        this._player._volume = this._totalVolume;
+        keys.forEach(key => this.setVolume(key, this._totalVolume));
+    }
+
+    setRelaunch(soundKey, needRelaunch = false) {
+        this._soundsState[soundKey].relaunch = needRelaunch;
+    };
+
+    stop({ soundKey }) {
+        if (!this._soundsState[soundKey].id)
+            return;
+
+        this._player.stop(this._soundsState[soundKey].id);
+        this._soundsState[soundKey].id = null;
+    };
+
+    pause({ soundKey }) {
+        if (this.canPlayCheck() || this._player.playing(this._soundsState[soundKey].id))
+            this._player.pause(this._soundsState[soundKey].id);
+    };
+
+    resume({ soundKey }) {
+        if (this.canPlayCheck() && !this._player.playing(this._soundsState[soundKey].id))
+            this._player.play(this._soundsState[soundKey].id);
+    };
+
+    updateEvents(eventsCfg) {
+        this._customUnsubscribe();
+        this._saveEvents(eventsCfg);
+        this._customSubscribe();
+    };
+
+    _saveEvents(eventsCfg) {
+        this._eventsCfg = eventsCfg;
+    }
+
+    _setEventCallback(soundKey, event) {
+        return function () {
+            const params = this._eventsCfg[soundKey].events[event];
+
+            this._reactToEvent(soundKey, params);
+        };
+    };
+
+    _onUnlock() {
+        this._runEventsFromQueue();
+        this._updateVolume();
+    };
+
+    _runEventsFromQueue() {
+        this._eventsQueue.forEach(event => this._reactToEvent(event.soundKey, event));
+        this._eventsQueue = [];
+    };
+
+    _addEventToQueue(data) {
+        this._eventsQueue.push(data);
+    };
+
+    _reactToEvent(soundKey, { action, loop, relaunch, volume = 0 }) {
+        volume *= this._totalVolume;
+        const self = this;
+        const params = { loop, relaunch, volume, soundKey };
+
+        if (!self[action])
+            Urso.logger.error(`Sound action '${action}' not found!`);
+
+        if (!this._isAudioUnlocked)
+            this._addEventToQueue({ ...params, action });
+
+        self[action](params);
+    };
+
+    _customSubscribe() {
+        for (const soundKey in this._eventsCfg) {
+            const { events = {} } = this._eventsCfg[soundKey];
+
+            for (const event in events) {
+                this.addListener(event, this._setEventCallback(soundKey, event).bind(this), true);
+            }
+        }
+    };
+
+    _customUnsubscribe() {
+        for (const event in this._eventsCfg) {
+            this.removeListener(event, this._setEventCallback(event).bind(this), true);
+        }
+    };
+};
+
 module.exports = SoundSprite;

package/src/js/modules/statesManager/_info.js

@@ -1,12 +1,12 @@
-Urso.Core.Modules.StatesManager = {
-    Action: require('./action.js'),
-    All: require('./all.js'),
-    ConfigStates: require('./configStates.js'),
-    Controller: require('./controller.js'),
-    FunctionsStorage: require('./functionsStorage.js'),
-    Helper: require('./helper.js'),
-    Race: require('./race.js'),
-    Sequence: require('./sequence.js')
-};
-
-require('./actions/_info.js');
+Urso.Core.Modules.StatesManager = {
+    Action: require('./action.js'),
+    All: require('./all.js'),
+    ConfigStates: require('./configStates.js'),
+    Controller: require('./controller.js'),
+    FunctionsStorage: require('./functionsStorage.js'),
+    Helper: require('./helper.js'),
+    Race: require('./race.js'),
+    Sequence: require('./sequence.js')
+};
+
+require('./actions/_info.js');