@urso/core 0.2.6 → 0.3.1

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

@@ -1,42 +1,42 @@
-class ModulesTransportConnectionTypesXhr extends Urso.Core.Modules.Transport.BaseConnectionType {
-    constructor(params){
-        super(params);
-
-        this._xhr = null;
-        this._ready = true;
-    }
-
-    send(message){
-        this._createXhr();
-        const preparedMessage = JSON.stringify(message);
-        this._xhr.send(preparedMessage);
-        log('[XHR] SEND:', preparedMessage);
-    };
-
-
-    _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');
-    };
-
-    _onMessage(message){
-        const res = JSON.parse(message);
-        this._runCallback('response', res);
-        log('[XHR] RESPONSE RECEIVED', message);
-    };
-
-    _onError(){
-        this._runCallback('error');
-        log('[XHR] ERROR')
-    };
-
-    _onReadyStateChange({ target }){
-        if(target.readyState === 4)
-            this._onMessage(target.response);
-    };
-}
-
+class ModulesTransportConnectionTypesXhr extends Urso.Core.Modules.Transport.BaseConnectionType {
+    constructor(params){
+        super(params);
+
+        this._xhr = null;
+        this._ready = true;
+    }
+
+    send(message){
+        this._createXhr();
+        const preparedMessage = JSON.stringify(message);
+        this._xhr.send(preparedMessage);
+        log('[XHR] SEND:', preparedMessage);
+    };
+
+
+    _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');
+    };
+
+    _onMessage(message){
+        const res = JSON.parse(message);
+        this._runCallback('response', res);
+        log('[XHR] RESPONSE RECEIVED', message);
+    };
+
+    _onError(){
+        this._runCallback('error');
+        log('[XHR] ERROR')
+    };
+
+    _onReadyStateChange({ target }){
+        if(target.readyState === 4)
+            this._onMessage(target.response);
+    };
+}
+
 module.exports = ModulesTransportConnectionTypesXhr;

package/src/js/modules/transport/controller.js

@@ -1,48 +1,48 @@
-class ModulesTransportController {
-    constructor() {
-        this._service = null;
-    }
-
-    _updateService() {
-        this._service = this.getInstance('Service');
-    };
-
-    init(){
-        this._updateService();
-        this._service.init();
-    };
-
-    setOnConnectionHandler(handler){
-        this._service.on('connection', handler);
-    };
-
-    setReadyHandler(handler){
-        this._service.on('ready', handler);
-    };
-
-    setErrorHandler(handler){
-        this._service.on('error', handler);
-    };
-
-    setResponseHandler(handler){
-        this._service.on('response', handler);
-    };
-
-    setOnCloseHandler(handler){
-        this._service.on('close', handler);
-    };
-
-    send(message){
-        this._service.send(message);
-    };
-
-    reconnect(){
-        this._service.reconnect();
-    };
-
-    close(){
-        this._service.close();
-    };
-}
-
-module.exports = ModulesTransportController;
+class ModulesTransportController {
+    constructor() {
+        this._service = null;
+    }
+
+    _updateService() {
+        this._service = this.getInstance('Service');
+    };
+
+    init(){
+        this._updateService();
+        this._service.init();
+    };
+
+    setOnConnectionHandler(handler){
+        this._service.on('connection', handler);
+    };
+
+    setReadyHandler(handler){
+        this._service.on('ready', handler);
+    };
+
+    setErrorHandler(handler){
+        this._service.on('error', handler);
+    };
+
+    setResponseHandler(handler){
+        this._service.on('response', handler);
+    };
+
+    setOnCloseHandler(handler){
+        this._service.on('close', handler);
+    };
+
+    send(message){
+        this._service.send(message);
+    };
+
+    reconnect(){
+        this._service.reconnect();
+    };
+
+    close(){
+        this._service.close();
+    };
+}
+
+module.exports = ModulesTransportController;

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

@@ -1,16 +1,16 @@
-class ModulesTransportDecorator {
-    constructor() {
-        this.singleton = true;
-    }
-
-    toServer(message) {
-        return message;
-    };
-
-    toFront(message) {
-        return message;
-    };
-
-}
-
-module.exports = ModulesTransportDecorator;
+class ModulesTransportDecorator {
+    constructor() {
+        this.singleton = true;
+    }
+
+    toServer(message) {
+        return message;
+    };
+
+    toFront(message) {
+        return message;
+    };
+
+}
+
+module.exports = ModulesTransportDecorator;

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

@@ -1,138 +1,140 @@
-class ModulesTransportService {
-    constructor() {
-        this._callbacks = {};
-        this._config = this.getInstance('Config').getConfig();
-
-        this.WEBSOCKET = 'websocket';
-        this.XHR = 'xhr';
-
-        this._communicator = null;
-    }
-
-    on(event, callback, force) {
-        if (!this._checkCallback(event) || force)
-            this._setCallback(event, callback);
-    };
-
-    init() {
-        this._createConnection();
-    };
-
-    send(message) {
-        if (!this._checkCommunicator() || !this._checkCommunicatorReady())
-            return false;
-
-        const decoratedMessage = this.getInstance('Decorator').toServer(message);
-        const validatedMessage = this._validateMessage(decoratedMessage);
-        this._communicator.send(validatedMessage);
-
-        return true;
-    };
-
-    reconnect() {
-        if (!this._checkCommunicator())
-            return false;
-
-        this._communicator.reconnect(this._config.autoReconnectionDelay || 0);
-
-        return true;
-    };
-
-    close() {
-        if (!this._checkCommunicator())
-            return false;
-
-        this._communicator.close();
-
-        return true;
-    };
-
-    _checkCallback(event) {
-        const result = !!this._callbacks[event];
-
-        if (result)
-            Urso.logger.error(`Overwrite ${event} event detected!`);
-
-        return result;
-    };
-
-    _checkCommunicator() {
-        if (!this._communicator)
-            Urso.logger.error('Communicator was not created!');
-
-        return true;
-    }
-
-    _checkCommunicatorReady() {
-        return this._communicator.readyCheck();
-    };
-
-    _destroyCommunicator() {
-        this._communicator = null;
-    };
-
-    _prepareCallback(event, callback) {
-        const func = message => {
-            const data = this._runMiddleWare(event, message);
-            return callback(data);
-        };
-
-        return func;
-    }
-
-    _runMiddleWare(event, data) {
-        switch (event) {
-            case 'response':
-                const decoratedMessage = this.getInstance('Decorator').toFront(JSON.parse(data));
-                return this._validateMessage(decoratedMessage);
-
-            case 'close':
-            case 'error':
-                this._tryReconnect();;
-            default:
-                return data;
-        }
-    };
-
-    _tryReconnect() {
-        if (!this._config.autoReconnection)
-            return false;
-
-        this._communicator.reconnect(this._config.autoReconnectionDelay);
-    };
-
-    _setCallback(event, callback) {
-        this._callbacks[event] = this._prepareCallback(event, callback);
-    };
-
-    _validateMessage(message) {
-        // TODO : SET VALIDATION MODELS
-        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;
-        }
-    };
-
-    _createConnection(type = this.WEBSOCKET) {
-        const host = this._getHost(type);
-        const callbacks = this._callbacks;
-        const capitalizedType = Urso.helper.capitaliseFirstLetter(type);
-
-        this._communicator = this.getInstance(`ConnectionTypes.${capitalizedType}`, { callbacks, host });
-
-        if (!this._communicator)
-            Urso.logger.error(`Transport type: '${capitalizedType}' was not found!`);
-    };
-}
-
-module.exports = ModulesTransportService;
+class ModulesTransportService {
+    constructor() {
+        this._callbacks = {};
+        this._config = this.getInstance('Config').getConfig();
+
+        this.WEBSOCKET = 'websocket';
+        this.XHR = 'xhr';
+
+        this._communicator = null;
+    }
+
+    on(event, callback, force) {
+        if (!this._checkCallback(event) || force)
+            this._setCallback(event, callback);
+    };
+
+    init() {
+        if(Urso.config.useTransport){
+            this._createConnection();
+        }
+    };
+
+    send(message) {
+        if (!this._checkCommunicator() || !this._checkCommunicatorReady())
+            return false;
+
+        const decoratedMessage = this.getInstance('Decorator').toServer(message);
+        const validatedMessage = this._validateMessage(decoratedMessage);
+        this._communicator.send(validatedMessage);
+
+        return true;
+    };
+
+    reconnect() {
+        if (!this._checkCommunicator())
+            return false;
+
+        this._communicator.reconnect(this._config.autoReconnectionDelay || 0);
+
+        return true;
+    };
+
+    close() {
+        if (!this._checkCommunicator())
+            return false;
+
+        this._communicator.close();
+
+        return true;
+    };
+
+    _checkCallback(event) {
+        const result = !!this._callbacks[event];
+
+        if (result)
+            Urso.logger.error(`Overwrite ${event} event detected!`);
+
+        return result;
+    };
+
+    _checkCommunicator() {
+        if (!this._communicator)
+            Urso.logger.error('Communicator was not created!');
+
+        return true;
+    }
+
+    _checkCommunicatorReady() {
+        return this._communicator.readyCheck();
+    };
+
+    _destroyCommunicator() {
+        this._communicator = null;
+    };
+
+    _prepareCallback(event, callback) {
+        const func = message => {
+            const data = this._runMiddleWare(event, message);
+            return callback(data);
+        };
+
+        return func;
+    }
+
+    _runMiddleWare(event, data) {
+        switch (event) {
+            case 'response':
+                const decoratedMessage = this.getInstance('Decorator').toFront(JSON.parse(data));
+                return this._validateMessage(decoratedMessage);
+
+            case 'close':
+            case 'error':
+                this._tryReconnect();;
+            default:
+                return data;
+        }
+    };
+
+    _tryReconnect() {
+        if (!this._config.autoReconnection)
+            return false;
+
+        this._communicator.reconnect(this._config.autoReconnectionDelay);
+    };
+
+    _setCallback(event, callback) {
+        this._callbacks[event] = this._prepareCallback(event, callback);
+    };
+
+    _validateMessage(message) {
+        // TODO : SET VALIDATION MODELS
+        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;
+        }
+    };
+
+    _createConnection(type = this.WEBSOCKET) {
+        const host = this._getHost(type);
+        const callbacks = this._callbacks;
+        const capitalizedType = Urso.helper.capitaliseFirstLetter(type);
+
+        this._communicator = this.getInstance(`ConnectionTypes.${capitalizedType}`, { callbacks, host });
+
+        if (!this._communicator)
+            Urso.logger.error(`Transport type: '${capitalizedType}' was not found!`);
+    };
+}
+
+module.exports = ModulesTransportService;

package/src/js/templates/_info.js

@@ -1,4 +1,4 @@
-Urso.Core.Templates = {};
-
-require('./groups/_info.js');
-require('./scenes/_info.js');
+Urso.Core.Templates = {};
+
+require('./groups/_info.js');
+require('./scenes/_info.js');

package/src/js/templates/groups/_info.js

@@ -1 +1 @@
-Urso.Core.Templates.Groups = {};
+Urso.Core.Templates.Groups = {};

package/src/js/templates/scenes/_info.js

@@ -1 +1 @@
-Urso.Core.Templates.Scenes = {};
+Urso.Core.Templates.Scenes = {};

package/webpack.config.js

@@ -1,47 +1,47 @@
-const path = require('path');
-const packageJson = require('./package.json');
-const root = process.cwd();
-
-const version = packageJson.version;
-
-module.exports = () => {
-  const config = {
-    entry: {
-      index: path.resolve(root, 'src', 'js', 'index.js')
-    },
-    output: {
-      path: path.resolve(root, 'build'),
-      filename: path.join('js', 'index.js'),
-      publicPath: '/'
-    },
-    module: {
-      rules: [
-        {
-          test: /app\.js$/,
-          loader: 'string-replace-loader',
-          options: {
-            search: 'APP_VERSION',
-            replace: version,
-          }
-        },
-        {
-          test: /\.css$/,
-          use: ['style-loader', 'css-loader'],
-        },
-        {
-          test: /\.js$/,
-          enforce: "pre",
-          use: ["source-map-loader"],
-        },
-        {
-          test: /\.js$/,
-          exclude: /node_modules/,
-          use: {
-            loader: 'babel-loader'
-          }
-        }
-      ]
-    }
-  };
-  return config;
-};
+const path = require('path');
+const packageJson = require('./package.json');
+const root = process.cwd();
+
+const version = packageJson.version;
+
+module.exports = () => {
+  const config = {
+    entry: {
+      index: path.resolve(root, 'src', 'js', 'index.js')
+    },
+    output: {
+      path: path.resolve(root, 'build'),
+      filename: path.join('js', 'index.js'),
+      publicPath: '/'
+    },
+    module: {
+      rules: [
+        {
+          test: /app\.js$/,
+          loader: 'string-replace-loader',
+          options: {
+            search: 'APP_VERSION',
+            replace: version,
+          }
+        },
+        {
+          test: /\.css$/,
+          use: ['style-loader', 'css-loader'],
+        },
+        {
+          test: /\.js$/,
+          enforce: "pre",
+          use: ["source-map-loader"],
+        },
+        {
+          test: /\.js$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'babel-loader'
+          }
+        }
+      ]
+    }
+  };
+  return config;
+};

package/src/js/modules/assets/models/dragonBones.js

@@ -1,27 +0,0 @@
-class ModulesAssetsModelsDragonBones extends Urso.Core.Modules.Assets.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.assets.DRAGONBONES;
-
-        //for manual filenames setup
-        this.contents = Urso.helper.recursiveGet('contents', params, [
-            { type: Urso.types.assets.JSON, key: `${this.key}_skeletonJson`, path: this.skeletonJson },
-            { type: Urso.types.assets.JSON, key: `${this.key}_textureJson`, path: this.textureJson },
-            { type: Urso.types.assets.IMAGE, key: `${this.key}_textureImage`, path: this.textureImage }
-        ]);
-
-        this.path = false;
-        this.key = false;
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.skeletonJson = Urso.helper.recursiveGet('skeletonJson', params, false);
-        this.textureJson = Urso.helper.recursiveGet('textureJson', params, false);
-        this.textureImage = Urso.helper.recursiveGet('textureImage', params, false);
-    }
-}
-
-module.exports = ModulesAssetsModelsDragonBones;