@urso/core 0.3.3 → 0.3.7

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)