@osimatic/helpers-js 1.0.49 → 1.0.52

package/event_bus.js

@@ -10,7 +10,9 @@ class EventBus {
             return;
         }
 
-        handlers.forEach((handler) => handler.call(this, data));
+        handlers.forEach(function(handler) {
+            handler.call(this, data)
+        });
     }
 
     subscribe(name, handler) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.49",
+  "version": "1.0.52",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/web_socket.js

@@ -5,63 +5,94 @@ class WebSocket {
      * customBusEvents : events "spéciaux" en provenance de l'event bus qui seront dispatchés vers la socket : array({ 'custom_name' => 'event_name' }, ...)
     */
     static setEventListeners(socketEvents, busEvents, customBusEvents) {
+        const { EventBus } = require('./event_bus');
+
+        this.eventBus = new EventBus();
+		this.socketConnectionErrors = ['connect_error', 'connect_timeout', 'reconnect_error', 'reconnect_failed'];
         this.socketEvents = socketEvents;
 		this.busEvents = busEvents;
         this.customBusEvents = customBusEvents;
     }
 
-    static getEventBus() {
-        if (this.eventBus == 'undefined') {
-            const { EventBus } = require('./event_bus');
+	static connect(url, options, connectInitPayload, onUnavailableCallback, onConnectionAckCallback) {
+		const { io } = require('socket.io-client');
 
-            this.eventBus = new EventBus();
-        }
+		this.logged = false;
+		this.instance = io(url, options);
 
-        return this.eventBus;
-    }
+		this.registerErrorListeners(onUnavailableCallback);
+		this.registerEventListeners(connectInitPayload, onConnectionAckCallback, onUnavailableCallback);
+	}
 
-	static connect(url, options, connectInitPayload, onConnectionAckCallback, onUnavailableCallback) {
-        const io = require('socket.io-client');
+	static registerErrorListeners(onUnavailableCallback) {
+		var self = this;
 
-        this.logged = false;
-		this.instance = io(url, options);
+		self.socketConnectionErrors.forEach(function(event) {
+			self.instance.on(event, function() {
+				self.clear(onUnavailableCallback, event);
+			});
+		});
 
-		this.initEventListeners();
-		this.initConnectionListeners(onUnavailableCallback);
+		self.instance.on('error', function(error) {
+			self.clear(onUnavailableCallback, error);
+		});
+	}
+
+	static registerEventListeners(connectInitPayload, onConnectionAckCallback, onUnavailableCallback) {
+		var self = this;
 
-		this.instance.on('connect', () => {
-			if (this.logged) {
-				this.clear(onUnavailableCallback);
+		self.instance.on('connect', function() {
+			if (self.logged) { //reconnexion avant timeout : on supprime les listeners de l'event bus
+				self.clear();
 			}
 
-			this.logged = true;
-            this.instance.emit('connect_init', connectInitPayload, onConnectionAckCallback);
+			self.logged = true;
+
+			self.instance.emit('connect_init', connectInitPayload, onConnectionAckCallback);			
+		});
+
+		self.instance.on('disconnect', function() {
+			self.clear(onUnavailableCallback);
+		});
+
+		self.socketEvents.forEach(function (event) {
+			self.instance.on(event, function(payload) {
+				self.eventBus.publish(event, payload);
+			});
+		});
+
+		self.busEvents.forEach(function(event) {
+			self.eventBus.subscribe(event, function(payload) {
+				self.instance.emit(event, payload);
+			});
+		});
+
+        self.customBusEvents.forEach(function(object) {
+			self.eventBus.subscribe(object.custom_name, function(payload) {
+				self.instance.emit(object.event_name, payload)
+			});
 		});
 	}
 
-	static initConnectionListeners(onUnavailableCallback) {
-		['connect_error', 'connect_timeout', 'reconnect_error', 'reconnect_failed', 'disconnect'].forEach(event => this.instance.on(event, () => this.clear(event, onUnavailableCallback)));
-		this.instance.on('error', (error) => this.clear(error, onUnavailableCallback));
+	static unregisterEventListener() {
+		var self = this;
+
+		self.busEvents.forEach(function (event) {
+			self.eventBus.unsubscribe(event, {});
+		});
+
+        self.customBusEvents.forEach(function(object) {
+			self.eventBus.unsubscribe(object.custom_name, {});
+		});
 	}
 
-	static clear(error, onUnavailableCallback) {
+	static clear(onUnavailableCallback, error) {
 		this.unregisterEventListener();
-        
-        if (onUnavailableCallback != 'undefined') {
+
+		if (typeof onUnavailableCallback !== 'undefined') {
             onUnavailableCallback(error);
         }
 	}
-
-    static initEventListeners() {
-		this.socketEvents.forEach(event => this.instance.on(event, (payload) => this.eventBus.publish(event, payload)));
-		this.busEvents.forEach(event => this.eventBus.subscribe(event, (payload) => this.instance.emit(event, payload)));
-        this.customBusEvents.forEach((object) => this.eventBus.subscribe(object.custom_name, (payload) => this.instance.emit(object.event_name, payload)));
-	}
-
-	static unregisterEventListener() {
-		this.busEvents.forEach(event => this.eventBus.unsubscribe(event, {}));
-        this.customBusEvents.forEach((object) => this.eventBus.unsubscribe(object.custom_name, {}));
-	}
 }
 
 module.exports = { WebSocket };