@urso/core 0.7.92 → 0.7.93

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

@@ -1,219 +1,219 @@
-class ModulesStatesManagerController {
-
-    constructor() {
-        this.singleton = true;
-
-        this._configStates;
-        this._currentState;
-        this._currentAction;
-        this._forceNextStateKey = null;
-        this._started = false;
-        this._paused = false;
-        this._pauseNeedResume = false;
-
-        this.statesGuards = this.getInstance('FunctionsStorage');
-        this.actionsGuards = this.getInstance('FunctionsStorage');
-        this.actionsRuns = this.getInstance('FunctionsStorage');
-        this.actionsTerminations = this.getInstance('FunctionsStorage');
-
-
-        this._iterator; //will be defined after start
-        this._nextState = this._nextState.bind(this);
-        this._statesCallStatistic = {};
-    }
-
-    start() {
-        if (this._started)
-            return;
-
-        this._currentState = null;
-        this._iterator = this._iteratorConstructor();
-        this._started = true;
-        this._configStates = this.getInstance('ConfigStates').get();
-        this._nextState();
-    }
-
-    restart() {
-        this.stop();
-
-        this._started = false;
-        this._paused = false;
-        
-        this.start();
-    }
-
-    stop() {
-        this._currentAction && this._currentAction.forceDestroy();
-        this._currentAction = null;
-        this.emit(Urso.events.MODULES_STATES_MANAGER_STOP);
-    }
-
-    pause() {
-        this._paused = true;
-    }
-
-    resume() {
-        this._paused = false;
-
-        if (this._pauseNeedResume) {
-            this._pauseNeedResume = false;
-            this._nextState();
-        }
-    }
-
-    setForceNextState(stateKey) {
-        if (!this._configStates[stateKey]) {
-            Urso.logger.error('ModulesStatesManagerController: setForceNextState name error', stateKey);
-        }
-
-        this._forceNextStateKey = stateKey
-    }
-
-    _iteratorConstructor() {
-        let nextIndex = 0;
-
-        const getNextStateByOrder = () => {
-            let statesArray = Object.keys(this._configStates);
-
-            if (nextIndex === statesArray.length)
-                nextIndex = 0;
-
-            return statesArray[nextIndex++];
-        }
-
-        return {
-            next: (() => {
-                let statesArray = Object.keys(this._configStates);
-
-                //force next state
-                if (this._forceNextStateKey) {
-                    const forceNextStateKey = this._forceNextStateKey;
-                    this._forceNextStateKey = null;
-                    nextIndex = statesArray.indexOf(forceNextStateKey) + 1;
-                    return forceNextStateKey;
-                }
-
-                //nextState
-                if (this._currentState) {
-                    const currentState = this._configStates[this._currentState];
-
-                    if (currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
-                        for (const stateKey of currentState.nextState) {
-                            if (this.checkStateGuard(stateKey)) {
-                                nextIndex = statesArray.indexOf(stateKey) + 1;
-
-                                if (nextIndex === -1) {
-                                    Urso.logger.error('ModulesStatesManagerController: nextState name error', stateKey);
-                                    continue;
-                                }
-
-                                return stateKey;
-                            }
-                        }
-                    }
-                }
-
-                //go next state by order
-                let stateName;
-
-                do {
-                    stateName = getNextStateByOrder();
-                } while (!this.checkStateGuard(stateName));
-
-                return stateName;
-            }).bind(this)
-        }
-    }
-
-    _nextState() {
-        if (this._paused) {
-            this._pauseNeedResume = true;
-            return;
-        }
-
-        this._currentState = this._iterator.next();
-
-        //fill states call statistic
-        if (!this._statesCallStatistic[this._currentState]) this._statesCallStatistic[this._currentState] = 0;
-        this._statesCallStatistic[this._currentState]++;
-
-        this.emit(Urso.events.MODULES_STATES_MANAGER_STATE_CHANGE, this._currentState);
-
-        log('%c State ' + this._currentState, 'background: #bada55; color: #000')
-
-        let config = this._configStates[this._currentState];
-        let classInstance = this.getInstance('Helper').getActionByConfig(config);
-
-        //actions instances guard
-        if (!classInstance.guard())
-            return this._nextState();
-    
-        this._currentAction = classInstance;
-        classInstance.run(this._nextState);
-    }
-
-    //actions guards
-    addActionGuard = (key, guard) => {
-        this.actionsGuards.add(key, guard, true);
-    }
-
-    checkActionGuard = (key) => {
-        return this.actionsGuards.checkGuard(key);
-    }
-
-    removeActionGuard = (key, guard) => {
-        this.actionsGuards.remove(key, guard);
-    }
-
-    //actions runs
-    addActionRun = (key, runFunction) => {
-        this.actionsRuns.add(key, runFunction);
-    }
-
-    runAction = (key, onFinishCallback) => {
-        this.actionsRuns.runAndCallbackOnFinish(key, onFinishCallback);
-    }
-
-    removeActionRun = (key, runFunction) => {
-        this.actionsRuns.remove(key, runFunction);
-    }
-
-    //actions terminations
-    addActionTerminate = (key, terminateFunction) => {
-        this.actionsTerminations.add(key, terminateFunction);
-    }
-
-    terminateAction = (key) => {
-        this.actionsTerminations.run(key);
-    }
-
-    removeActionTerminate = (key, terminateFunction) => {
-        this.actionsTerminations.remove(key, terminateFunction);
-    }
-
-    //states guards
-    setStateGuard = (key, guard) => {
-        this.statesGuards.add(key, guard, true);
-    }
-
-    checkStateGuard = (key) => {
-        //auto guard will check callLimit and return false, if limit is reached
-        const callLimit = this._configStates[key].callLimit;
-
-        if (
-            callLimit &&
-            callLimit <= (this._statesCallStatistic[key] || 0)
-        ) { return false; }
-
-        const guardResult = this.statesGuards.checkGuard(key);
-        log('%c State guard ' + key + ' is ' + guardResult, 'background: #DA55C4; color: #000')
-        return guardResult;
-    }
-
-    removeStateGuard = (key, guard) => {
-        this.statesGuards.remove(key, guard);
-    }
-
-}
-
+class ModulesStatesManagerController {
+
+    constructor() {
+        this.singleton = true;
+
+        this._configStates;
+        this._currentState;
+        this._currentAction;
+        this._forceNextStateKey = null;
+        this._started = false;
+        this._paused = false;
+        this._pauseNeedResume = false;
+
+        this.statesGuards = this.getInstance('FunctionsStorage');
+        this.actionsGuards = this.getInstance('FunctionsStorage');
+        this.actionsRuns = this.getInstance('FunctionsStorage');
+        this.actionsTerminations = this.getInstance('FunctionsStorage');
+
+
+        this._iterator; //will be defined after start
+        this._nextState = this._nextState.bind(this);
+        this._statesCallStatistic = {};
+    }
+
+    start() {
+        if (this._started)
+            return;
+
+        this._currentState = null;
+        this._iterator = this._iteratorConstructor();
+        this._started = true;
+        this._configStates = this.getInstance('ConfigStates').get();
+        this._nextState();
+    }
+
+    restart() {
+        this.stop();
+
+        this._started = false;
+        this._paused = false;
+        
+        this.start();
+    }
+
+    stop() {
+        this._currentAction && this._currentAction.forceDestroy();
+        this._currentAction = null;
+        this.emit(Urso.events.MODULES_STATES_MANAGER_STOP);
+    }
+
+    pause() {
+        this._paused = true;
+    }
+
+    resume() {
+        this._paused = false;
+
+        if (this._pauseNeedResume) {
+            this._pauseNeedResume = false;
+            this._nextState();
+        }
+    }
+
+    setForceNextState(stateKey) {
+        if (!this._configStates[stateKey]) {
+            Urso.logger.error('ModulesStatesManagerController: setForceNextState name error', stateKey);
+        }
+
+        this._forceNextStateKey = stateKey
+    }
+
+    _iteratorConstructor() {
+        let nextIndex = 0;
+
+        const getNextStateByOrder = () => {
+            let statesArray = Object.keys(this._configStates);
+
+            if (nextIndex === statesArray.length)
+                nextIndex = 0;
+
+            return statesArray[nextIndex++];
+        }
+
+        return {
+            next: (() => {
+                let statesArray = Object.keys(this._configStates);
+
+                //force next state
+                if (this._forceNextStateKey) {
+                    const forceNextStateKey = this._forceNextStateKey;
+                    this._forceNextStateKey = null;
+                    nextIndex = statesArray.indexOf(forceNextStateKey) + 1;
+                    return forceNextStateKey;
+                }
+
+                //nextState
+                if (this._currentState) {
+                    const currentState = this._configStates[this._currentState];
+
+                    if (currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
+                        for (const stateKey of currentState.nextState) {
+                            if (this.checkStateGuard(stateKey)) {
+                                nextIndex = statesArray.indexOf(stateKey) + 1;
+
+                                if (nextIndex === -1) {
+                                    Urso.logger.error('ModulesStatesManagerController: nextState name error', stateKey);
+                                    continue;
+                                }
+
+                                return stateKey;
+                            }
+                        }
+                    }
+                }
+
+                //go next state by order
+                let stateName;
+
+                do {
+                    stateName = getNextStateByOrder();
+                } while (!this.checkStateGuard(stateName));
+
+                return stateName;
+            }).bind(this)
+        }
+    }
+
+    _nextState() {
+        if (this._paused) {
+            this._pauseNeedResume = true;
+            return;
+        }
+
+        this._currentState = this._iterator.next();
+
+        //fill states call statistic
+        if (!this._statesCallStatistic[this._currentState]) this._statesCallStatistic[this._currentState] = 0;
+        this._statesCallStatistic[this._currentState]++;
+
+        this.emit(Urso.events.MODULES_STATES_MANAGER_STATE_CHANGE, this._currentState);
+
+        log('%c State ' + this._currentState, 'background: #bada55; color: #000')
+
+        let config = this._configStates[this._currentState];
+        let classInstance = this.getInstance('Helper').getActionByConfig(config);
+
+        //actions instances guard
+        if (!classInstance.guard())
+            return this._nextState();
+    
+        this._currentAction = classInstance;
+        classInstance.run(this._nextState);
+    }
+
+    //actions guards
+    addActionGuard = (key, guard) => {
+        this.actionsGuards.add(key, guard, true);
+    }
+
+    checkActionGuard = (key) => {
+        return this.actionsGuards.checkGuard(key);
+    }
+
+    removeActionGuard = (key, guard) => {
+        this.actionsGuards.remove(key, guard);
+    }
+
+    //actions runs
+    addActionRun = (key, runFunction) => {
+        this.actionsRuns.add(key, runFunction);
+    }
+
+    runAction = (key, onFinishCallback) => {
+        this.actionsRuns.runAndCallbackOnFinish(key, onFinishCallback);
+    }
+
+    removeActionRun = (key, runFunction) => {
+        this.actionsRuns.remove(key, runFunction);
+    }
+
+    //actions terminations
+    addActionTerminate = (key, terminateFunction) => {
+        this.actionsTerminations.add(key, terminateFunction);
+    }
+
+    terminateAction = (key) => {
+        this.actionsTerminations.run(key);
+    }
+
+    removeActionTerminate = (key, terminateFunction) => {
+        this.actionsTerminations.remove(key, terminateFunction);
+    }
+
+    //states guards
+    setStateGuard = (key, guard) => {
+        this.statesGuards.add(key, guard, true);
+    }
+
+    checkStateGuard = (key) => {
+        //auto guard will check callLimit and return false, if limit is reached
+        const callLimit = this._configStates[key].callLimit;
+
+        if (
+            callLimit &&
+            callLimit <= (this._statesCallStatistic[key] || 0)
+        ) { return false; }
+
+        const guardResult = this.statesGuards.checkGuard(key);
+        log('%c State guard ' + key + ' is ' + guardResult, 'background: #DA55C4; color: #000')
+        return guardResult;
+    }
+
+    removeStateGuard = (key, guard) => {
+        this.statesGuards.remove(key, guard);
+    }
+
+}
+
 module.exports = ModulesStatesManagerController;

package/src/js/modules/statesManager/functionsStorage.js

@@ -1,83 +1,83 @@
-
-class ModulesStatesManagerFunctionsStorage {
-    constructor() {
-        this._functionsCounter = 0;
-        this._functions = {};
-    }
-
-    //guards
-    add(key, guard, onlyOneFlag = false) {
-        this._addToStorage(key, guard, onlyOneFlag);
-    }
-
-    run(key) {
-        if (this._functions[key]) {
-            const functionsArray = Object.values(this._functions[key]);
-
-            for (const func of functionsArray) {
-                func();
-            }
-        }
-    }
-
-    runAndCallbackOnFinish(key, onFinishCallback) {
-        if (this._functions[key]) {
-            const functionsArray = Object.values(this._functions[key]);
-
-            const promises = [];
-
-            for (const func of functionsArray) {
-                promises.push(new Promise((resolve, reject) => { func(resolve); }));
-            }
-
-            Promise.all(promises).then(onFinishCallback);
-        } else {
-            onFinishCallback();
-        }
-    }
-
-    checkGuard(key) {
-        if (this._functions[key]) {
-            const guardsArray = Object.values(this._functions[key]);
-
-            for (const guard of guardsArray) {
-                if (!guard())
-                    return false;
-            }
-        }
-
-        return true;
-    }
-
-    remove(key, guard) {
-        this._removeFromStorage(key, guard);
-    }
-
-    _addToStorage(key, func, onlyOneFlag) {
-        if (!this._functions[key])
-            this._functions[key] = {};
-        else if (onlyOneFlag) {
-            Urso.logger.error('ModulesStatesManagerFunctionsStorage: action or state can have only one guard', key, func);
-            return;
-        }
-
-        const guid = this._getGuardsUid();
-        func._guid = guid;
-        this._functions[key][guid] = func;
-    }
-
-    _removeFromStorage(key, func) {
-        const guid = func._guid;
-        delete this._functions[key][guid];
-
-        if (Urso.helper.getObjectSize(this._functions[key]) === 0)
-            delete this._functions[key];
-    }
-
-    _getGuardsUid() {
-        this._functionsCounter++;
-        return 'guard_' + this._functionsCounter;
-    }
-}
-
+
+class ModulesStatesManagerFunctionsStorage {
+    constructor() {
+        this._functionsCounter = 0;
+        this._functions = {};
+    }
+
+    //guards
+    add(key, guard, onlyOneFlag = false) {
+        this._addToStorage(key, guard, onlyOneFlag);
+    }
+
+    run(key) {
+        if (this._functions[key]) {
+            const functionsArray = Object.values(this._functions[key]);
+
+            for (const func of functionsArray) {
+                func();
+            }
+        }
+    }
+
+    runAndCallbackOnFinish(key, onFinishCallback) {
+        if (this._functions[key]) {
+            const functionsArray = Object.values(this._functions[key]);
+
+            const promises = [];
+
+            for (const func of functionsArray) {
+                promises.push(new Promise((resolve, reject) => { func(resolve); }));
+            }
+
+            Promise.all(promises).then(onFinishCallback);
+        } else {
+            onFinishCallback();
+        }
+    }
+
+    checkGuard(key) {
+        if (this._functions[key]) {
+            const guardsArray = Object.values(this._functions[key]);
+
+            for (const guard of guardsArray) {
+                if (!guard())
+                    return false;
+            }
+        }
+
+        return true;
+    }
+
+    remove(key, guard) {
+        this._removeFromStorage(key, guard);
+    }
+
+    _addToStorage(key, func, onlyOneFlag) {
+        if (!this._functions[key])
+            this._functions[key] = {};
+        else if (onlyOneFlag) {
+            Urso.logger.error('ModulesStatesManagerFunctionsStorage: action or state can have only one guard', key, func);
+            return;
+        }
+
+        const guid = this._getGuardsUid();
+        func._guid = guid;
+        this._functions[key][guid] = func;
+    }
+
+    _removeFromStorage(key, func) {
+        const guid = func._guid;
+        delete this._functions[key][guid];
+
+        if (Urso.helper.getObjectSize(this._functions[key]) === 0)
+            delete this._functions[key];
+    }
+
+    _getGuardsUid() {
+        this._functionsCounter++;
+        return 'guard_' + this._functionsCounter;
+    }
+}
+
 module.exports = ModulesStatesManagerFunctionsStorage;

package/src/js/modules/statesManager/helper.js

@@ -1,27 +1,27 @@
-class ModulesStatesManagerHelper {
-    constructor() {
-        this.singleton = true;
-    }
-
-    getActionByConfig(config) {
-        let actionType = Object.keys(config)[0];
-        let actionParams = config[actionType];
-
-        if (actionType === "action") {
-            //actionParams is action name
-            let actionName = actionParams;
-
-            let customActionInstance = this.getInstance('Actions.' + Urso.helper.capitaliseFirstLetter(actionName));
-
-            if (customActionInstance) {
-                return customActionInstance;
-            }
-        }
-
-        let className = Urso.helper.capitaliseFirstLetter(actionType);
-        return this.getInstance(className, actionParams);
-    };
-
-}
-
-module.exports = ModulesStatesManagerHelper;
+class ModulesStatesManagerHelper {
+    constructor() {
+        this.singleton = true;
+    }
+
+    getActionByConfig(config) {
+        let actionType = Object.keys(config)[0];
+        let actionParams = config[actionType];
+
+        if (actionType === "action") {
+            //actionParams is action name
+            let actionName = actionParams;
+
+            let customActionInstance = this.getInstance('Actions.' + Urso.helper.capitaliseFirstLetter(actionName));
+
+            if (customActionInstance) {
+                return customActionInstance;
+            }
+        }
+
+        let className = Urso.helper.capitaliseFirstLetter(actionType);
+        return this.getInstance(className, actionParams);
+    };
+
+}
+
+module.exports = ModulesStatesManagerHelper;