@urso/core 0.3.1 → 0.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.3.1",
+  "version": "0.3.5",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/modules/objects/models/checkbox.js

@@ -22,7 +22,7 @@ class ModulesObjectsModelsCheckbox extends UrsoCoreModulesObjectsModelsToggle {
         this.contents = [];
 
         this.action = Urso.helper.recursiveGet('action', params, () => { 
-            this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, { name: this.name, status: this._toggleStatus, class: this.class }) 
+            this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, { name: this.name, status: this.status, class: this.class }) 
         });
 
         this.lable = Urso.helper.recursiveGet('lable', params, false);
@@ -31,7 +31,7 @@ class ModulesObjectsModelsCheckbox extends UrsoCoreModulesObjectsModelsToggle {
     }
 
     _createCheckbox() {
-        this._toggleStatus = this.defaultStatus;
+        this.status = this.defaultStatus;
         this._checkbox = this._createObject(this.buttonFrames[`${this.defaultStatus}Out`])
 
         if (this.lable)
@@ -77,14 +77,15 @@ class ModulesObjectsModelsCheckbox extends UrsoCoreModulesObjectsModelsToggle {
 
     _changeTexture(key) {
         if (!this.buttonFrames[key]) {
-            if (key === `${this._toggleStatus}Out`) {
+            if (key === `${this.status}Out`) {
                 Urso.logger.error('ModulesObjectsModelsButton assets error: no out image ' + this.buttonFrames.out);
                 return false;
             }
 
-            this._changeTexture(`${this._toggleStatus}Out`); // load default texture for this key
+            this._changeTexture(`${this.status}Out`); // load default texture for this key
             return false;
         }
+        
         if (this.buttonFrames[key].type === Urso.types.objects.GRAPHICS)
             this._drawGraphics(this.buttonFrames[key].figure);
         else

package/src/js/modules/objects/models/spine.js

@@ -57,7 +57,6 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
             this._baseObject.state.timeScale = config.timeScale;
 
         if (config.onComplete) {
-            window.asd = this._baseObject.state
             this._baseObject.state.clearListeners();
             this._baseObject.state.addListener({ complete: this.animation.onComplete });
         }

package/src/js/modules/objects/models/textInput.js

@@ -16,6 +16,7 @@ class ModulesObjectsModelsTextInput extends Urso.Core.Modules.Objects.BaseModel
         this.numbersOnly = Urso.helper.recursiveGet('numbersOnly', params, false);
         this.allowedSymbols = Urso.helper.recursiveGet('allowedSymbols', params, false);
         this.substituteText = Urso.helper.recursiveGet('substituteText', params, false);
+        this.maxLength = Urso.helper.recursiveGet('maxLength', params, false);
     }
 
     restrictInput(allowedSymbols) {
@@ -40,15 +41,25 @@ class ModulesObjectsModelsTextInput extends Urso.Core.Modules.Objects.BaseModel
     }
 
     _onBlur(){
-        this.text = this._baseObject.text;
         const data = {name: this.name, class: this.class, id: this.id, text: this.text};
         this.emit(Urso.events.MODULES_OBJECTS_TEXTINPUT_BLUR, data);
     }
 
+    _onInput() {
+        this.text = this._baseObject.text;
+        const data = {name: this.name, class: this.class, id: this.id, text: this.text};
+        this.emit(Urso.events.MODULES_OBJECTS_TEXTINPUT_INPUT, data);
+    }
+
     _addBaseObject() {
         this._baseObject = new PIXI.TextInput({ input: this.input, box: this.box });
         this._baseObject.substituteText = this.substituteText;
+
+        if(this.maxLength)
+            this._baseObject.maxLength = this.maxLength
+
         this._baseObject.on('blur', this._onBlur.bind(this))
+        this._baseObject.on('input', this._onInput.bind(this))
     };
 }
 

package/src/js/modules/objects/models/toggle.js

@@ -5,7 +5,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
     constructor(params) {
         super(params);
 
-        this._toggleStatus = 'unpressed';
+        this.status = 'unpressed';
 
         this.type = Urso.types.objects.TOGGLE;
         this._addBaseObject();
@@ -18,7 +18,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         super.setupParams(params);
 
         this.action = Urso.helper.recursiveGet('action', params, () => { 
-            this.emit(Urso.events.MODULES_OBJECTS_TOGGLE_PRESS, { name: this.name, status: this._toggleStatus, class: this.class }) 
+            this.emit(Urso.events.MODULES_OBJECTS_TOGGLE_PRESS, { name: this.name, status: this.status, class: this.class }) 
         });
 
         this.buttonFrames = {
@@ -37,13 +37,13 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         this.buttonFrames[key] = assetKey;
 
         if (this._isOver)
-            this._changeTexture(`${this._toggleStatus}Over`);
+            this._changeTexture(`${this.status}Over`);
         else if(this._isDown)
-            this._changeTexture(`${this._toggleStatus}Down`);
+            this._changeTexture(`${this.status}Down`);
         else if(this._isDisabled)
-            this._changeTexture(`${this._toggleStatus}Disabled`);
+            this._changeTexture(`${this.status}Disabled`);
         else
-            this._changeTexture(`${this._toggleStatus}Out`);
+            this._changeTexture(`${this.status}Out`);
     }
 
     enable() {
@@ -51,9 +51,9 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
             return false;
 
         if (this._isOver)
-            this._changeTexture(`${this._toggleStatus}Over`);
+            this._changeTexture(`${this.status}Over`);
         else
-            this._changeTexture(`${this._toggleStatus}Out`);
+            this._changeTexture(`${this.status}Out`);
 
         this._isDisabled = false;
     }
@@ -62,7 +62,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         if (this._isDisabled)
             return false;
 
-        this._changeTexture(`${this._toggleStatus}Disabled`);
+        this._changeTexture(`${this.status}Disabled`);
         this._isDisabled = true;
     }
 
@@ -101,9 +101,9 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         if (this._isDisabled) //can be disabled after keyDownAction
             return false;
 
-        this._changeTexture(`${this._toggleStatus}Down`);
+        this._changeTexture(`${this.status}Down`);
 
-        this._toggleStatus = this._toggleStatus === 'pressed' ? 'unpressed' : 'pressed';
+        this.status = this.status === 'pressed' ? 'unpressed' : 'pressed';
     }
 
     _onButtonUp() {
@@ -119,9 +119,9 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
             return false;
 
         if (this._isOver)
-            this._changeTexture(`${this._toggleStatus}Over`);
+            this._changeTexture(`${this.status}Over`);
         else
-            this._changeTexture(`${this._toggleStatus}Out`);
+            this._changeTexture(`${this.status}Out`);
     }
 
     _onButtonOver() {
@@ -133,7 +133,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         if (this.mouseOverAction)
             this.mouseOverAction();
 
-        this._changeTexture(`${this._toggleStatus}Over`);
+        this._changeTexture(`${this.status}Over`);
     }
 
     _onButtonOut() {
@@ -145,19 +145,28 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         if (this.mouseOutAction)
             this.mouseOutAction();
 
-        this._changeTexture(`${this._toggleStatus}Out`);
+        this._changeTexture(`${this.status}Out`);
+    }
+
+    switchStatus() {
+        this.status = this.status === 'pressed' ? 'unpressed' : 'pressed';
+        
+        if (this._isOver)
+            this._changeTexture(`${this.status}Over`);
+        else
+            this._changeTexture(`${this.status}Out`);
     }
 
     _changeTexture(key) {
         let texture = Urso.cache.getTexture(this.buttonFrames[key]);
 
         if (!texture) {
-            if (key === `${this._toggleStatus}Out`) {
+            if (key === `${this.status}Out`) {
                 Urso.logger.error('ModulesObjectsModelsButton assets error: no out image ' + this.buttonFrames.out);
                 return false;
             }
 
-            this._changeTexture(`${this._toggleStatus}Out`); // load default texture for this key
+            this._changeTexture(`${this.status}Out`); // load default texture for this key
             return false;
         }
 

package/src/js/modules/observer/events.js

@@ -12,11 +12,14 @@ class ModulesObserverConfig {
             MODULES_OBJECTS_SLIDER_SET_NEW_VALUE: 'modules.objects.slider.setNewValue',
             MODULES_OBJECTS_TOGGLE_PRESS: 'modules.objects.toggle.press',
             MODULES_OBJECTS_TEXTINPUT_BLUR: 'modules.objects.textinput.blur',
+            MODULES_OBJECTS_TEXTINPUT_INPUT: 'modules.objects.textinput.input',
             MODULES_OBJECTS_CHECKBOX_PRESS: 'modules.objects.checkbox.press',
             MODULES_LOGIC_SOUNDS_DO: 'modules.soundManager.do',
             MODULES_SOUND_MANAGER_UPDATE_CFG: 'modules.soundManager.updateCfg',
             MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME: 'modules.soundManager.setGlobalVolume',
             MODULES_STATES_MANAGER_STATE_CHANGE: 'modules.statesManager.stateChange',
+            MODULES_STATES_MANAGER_ACTION_START: 'modules.statesManager.actionStart',
+            MODULES_STATES_MANAGER_ACTION_FINISH: 'modules.statesManager.actionFinish',
             MODULES_SCENES_ORIENTATION_CHANGE: 'modules.scenes.orientation.change',
             MODULES_SCENES_NEW_RESOLUTION: 'modules.scenes.newResolution',
             MODULES_SCENES_NEW_SCENE_INIT: 'modules.scenes.newSceneInit',

package/src/js/modules/statesManager/action.js

@@ -18,6 +18,8 @@ class ModulesStatesManagerAction {
     run(onFinishCallback) {
         log(`%c action run ---> ${this.name}`, 'color: blue');
 
+        this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_START, this.name);
+
         this.finished = false;
         this._onFinishCallback = onFinishCallback;
 
@@ -47,6 +49,9 @@ class ModulesStatesManagerAction {
 
         this._terminating = false;
         this.finished = true;
+
+        this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_FINISH, this.name);
+        
         log(`%c action finish <--- ${this.name}`, 'color: blue');
         this._onFinishCallback();
     }

package/src/js/modules/statesManager/controller.js

@@ -27,6 +27,16 @@ class ModulesStatesManagerController {
 
     _iteratorConstructor() {
         let nextIndex = 0;
+    
+
+        const getNextStateByOrder = () => {
+            let statesArray = Object.keys(this._configStates);
+
+            if (nextIndex === statesArray.length)
+                nextIndex = 0;
+
+            return statesArray[nextIndex++];
+        }
 
         return {
             next: (() => {
@@ -36,7 +46,7 @@ class ModulesStatesManagerController {
                 if (this._currentState) {
                     const currentState = this._configStates[this._currentState];
 
-                    if (this.checkStateGuard(this._currentState) && currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
+                    if (currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
                         for (const stateKey of currentState.nextState) {
                             if (this.checkStateGuard(stateKey)) {
                                 nextIndex = statesArray.indexOf(stateKey) + 1;
@@ -52,11 +62,14 @@ class ModulesStatesManagerController {
                     }
                 }
 
-                //regular round logic
-                if (nextIndex === statesArray.length)
-                    nextIndex = 0;
+                //go next state by order
+                let stateName;
 
-                return statesArray[nextIndex++];
+                do {
+                    stateName = getNextStateByOrder();
+                } while (!this.checkStateGuard(stateName));
+
+                return stateName;
             }).bind(this)
         }
     }
@@ -71,10 +84,6 @@ class ModulesStatesManagerController {
         let config = this._configStates[this._currentState];
         let classInstance = this.getInstance('Helper').getActionByConfig(config);
 
-        //state guard
-        if (!this.checkStateGuard(this._currentState))
-            return this._nextState();
-
         //actions instances guard
         if (!classInstance.guard())
             return this._nextState();

package/src/js/modules/transport/config.js

@@ -1,22 +1,13 @@
 class ModulesTransportConfig {
-    constructor() {
-        this._setDefaultConfig();
-    }
 
     getConfig() {
-        return this._config;
-    };
-
-    _setDefaultConfig() {
-        this._config = {
-            autoReconnection: true,
-            autoReconnectionDelay: 5000,
-            hosts: {
-                wsHost: Urso.helper.parseGetParams('wsHost') || 'ws://localhost:9100/',
-                xhrHost: 'https://reqres.in/api/users/2'
+        return {
+                autoReconnect: true,
+                reconnectTimeout: 5000,
+                type: 'websocket', // websocket | xhr
+                host: Urso.helper.parseGetParams('wsHost')
             }
-        };
-    };
+        }
 }
 
 module.exports = ModulesTransportConfig;

package/src/js/modules/transport/connectionTypes/xhr.js

@@ -4,6 +4,7 @@ class ModulesTransportConnectionTypesXhr extends Urso.Core.Modules.Transport.Bas
 
         this._xhr = null;
         this._ready = true;
+        this._runCallback('ready');
     }
 
     send(message){
@@ -13,13 +14,15 @@ class ModulesTransportConnectionTypesXhr extends Urso.Core.Modules.Transport.Bas
         log('[XHR] SEND:', preparedMessage);
     };
 
+    _getMethod(){
+        return 'POST';
+    };
 
     _createXhr(){
         this._xhr = new XMLHttpRequest();
         this._xhr.onerror = this._onError.bind(this);
         this._xhr.onreadystatechange = this._onReadyStateChange.bind(this);
-        this._xhr.open('GET', this._host, true);
-        log('[XHR]: CREATED');
+        this._xhr.open(this._getMethod(), this._host, true);
     };
 
     _onMessage(message){

package/src/js/modules/transport/decorator.js

@@ -1,5 +1,6 @@
 class ModulesTransportDecorator {
-    constructor() {
+    constructor({ callbacks }) {
+        this._callbacks = callbacks;
         this.singleton = true;
     }
 

package/src/js/modules/transport/service.js

@@ -2,10 +2,6 @@ class ModulesTransportService {
     constructor() {
         this._callbacks = {};
         this._config = this.getInstance('Config').getConfig();
-
-        this.WEBSOCKET = 'websocket';
-        this.XHR = 'xhr';
-
         this._communicator = null;
     }
 
@@ -15,17 +11,25 @@ class ModulesTransportService {
     };
 
     init() {
-        if(Urso.config.useTransport){
-            this._createConnection();
-        }
+        this._createConnection();
     };
 
     send(message) {
         if (!this._checkCommunicator() || !this._checkCommunicatorReady())
             return false;
 
-        const decoratedMessage = this.getInstance('Decorator').toServer(message);
+        const decoratedMessage = this.getInstance('Decorator', { callbacks: this._callbacks }).toServer(message);
+
+        if(!decoratedMessage) {
+            return false;
+        }
+
         const validatedMessage = this._validateMessage(decoratedMessage);
+
+        if(!validatedMessage) {
+            return false;
+        }
+
         this._communicator.send(validatedMessage);
 
         return true;
@@ -35,7 +39,7 @@ class ModulesTransportService {
         if (!this._checkCommunicator())
             return false;
 
-        this._communicator.reconnect(this._config.autoReconnectionDelay || 0);
+        this._communicator.reconnect(this._getAutoReconnetionDelay());
 
         return true;
     };
@@ -85,7 +89,12 @@ class ModulesTransportService {
     _runMiddleWare(event, data) {
         switch (event) {
             case 'response':
-                const decoratedMessage = this.getInstance('Decorator').toFront(JSON.parse(data));
+                const decoratedMessage = this.getInstance('Decorator', { callbacks: this._callbacks }).toFront(data);
+
+                if(!decoratedMessage) {
+                    return;
+                }
+
                 return this._validateMessage(decoratedMessage);
 
             case 'close':
@@ -96,11 +105,19 @@ class ModulesTransportService {
         }
     };
 
+    _autoReconnectCheck() {
+        return this._config.reconnectTimeout;
+    }
+
+    _getAutoReconnetionDelay() {
+        return this._config.autoReconnect || 0;
+    }
+
     _tryReconnect() {
-        if (!this._config.autoReconnection)
+        if (!this._autoReconnectCheck())
             return false;
 
-        this._communicator.reconnect(this._config.autoReconnectionDelay);
+        this._communicator.reconnect(this._getAutoReconnetionDelay());
     };
 
     _setCallback(event, callback) {
@@ -112,24 +129,20 @@ class ModulesTransportService {
         return { ...message };
     };
 
-    _getHost(type) {
-        const hosts = this._config.hosts;
-
-        switch (type) {
-            case this.WEBSOCKET:
-                return hosts.wsHost;
-            case this.XHR:
-                return hosts.xhrHost;
-            default:
-                return false;
-        }
+    _getHost() {
+        return this._config.host;
     };
 
-    _createConnection(type = this.WEBSOCKET) {
-        const host = this._getHost(type);
+    _getType() {
+        return this._config.type;
+    }
+
+    _createConnection() {
+        const host = this._getHost();
+        const type = this._getType();
         const callbacks = this._callbacks;
         const capitalizedType = Urso.helper.capitaliseFirstLetter(type);
-
+        
         this._communicator = this.getInstance(`ConnectionTypes.${capitalizedType}`, { callbacks, host });
 
         if (!this._communicator)