@osimatic/helpers-js 1.0.46 → 1.0.49

package/event_bus.js

@@ -0,0 +1,37 @@
+class EventBus {
+    constructor() {
+		this.events = {}; 
+	}
+
+    publish(name, data) {
+        var handlers = this.events[name];
+
+        if (!!handlers === false) {
+            return;
+        }
+
+        handlers.forEach((handler) => handler.call(this, data));
+    }
+
+    subscribe(name, handler) {
+        var handlers = this.events[name];
+
+        if (!!handlers === false) {
+            handlers = this.events[name] = [];
+        } 
+
+        handlers.push(handler);
+    }
+
+    unsubscribe(name, handler) {
+        var handlers = this.events[name];
+
+        if (!!handlers === false) {
+            return;
+        } 
+
+		handlers.splice(handlers.indexOf(handler));
+    }
+}
+
+module.exports = { EventBus };

package/index.js

@@ -35,18 +35,19 @@ const { ImportFromCsv } = require('./import_from_csv');
 const { JwtToken, JwtSession } = require('./jwt');
 const { ListBox } = require('./list_box');
 const { WebRTC } = require('./web_rtc');
+const { EventBus } = require('./event_bus');
 
 // exports surcouche lib externe
 const { GoogleCharts } = require('./google_charts');
 const { GoogleRecaptcha } = require('./google_recaptcha');
 const { GoogleMap } = require('./google_maps');
 const { OpenStreetMap } = require('./open_street_map');
-const { WebSocket, EventBus } = require('./web_socket');
+const { WebSocket } = require('./web_socket');
 
 module.exports = {
 	Array, Object, Number, String,
 	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, SocialNetwork,
-	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox, WebRTC,
+	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox, WebRTC, WebSocket, EventBus,
 	sleep, refresh, chr, ord, trim, empty,
 	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
 };

package/package.json

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

package/web_socket.js

@@ -11,17 +11,22 @@ class WebSocket {
     }
 
     static getEventBus() {
+        if (this.eventBus == 'undefined') {
+            const { EventBus } = require('./event_bus');
+
+            this.eventBus = new EventBus();
+        }
+
         return this.eventBus;
     }
 
 	static connect(url, options, connectInitPayload, onConnectionAckCallback, onUnavailableCallback) {
         const io = require('socket.io-client');
 
-        this.eventBus = new EventBus();
         this.logged = false;
 		this.instance = io(url, options);
 
-		this.initEventsListeners();
+		this.initEventListeners();
 		this.initConnectionListeners(onUnavailableCallback);
 
 		this.instance.on('connect', () => {
@@ -40,63 +45,23 @@ class WebSocket {
 	}
 
 	static clear(error, onUnavailableCallback) {
-		this.unregisterOutcomingBusEvents();
+		this.unregisterEventListener();
         
         if (onUnavailableCallback != 'undefined') {
             onUnavailableCallback(error);
         }
 	}
 
-    static unregisterIncomingBusEvents() {
-        
-    }
-
-	static unregisterOutcomingBusEvents() {
-		this.busEvents.forEach(event => this.eventBus.unsubscribe(event, {}));
-        this.customBusEvents.forEach((object) => this.eventBus.unsubscribe(object.custom_name, {}));
-	}
-
-	static initEventsListeners() {
+    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)));
 	}
-}
 
-class EventBus {
-    constructor() {
-		this.events = {}; 
+	static unregisterEventListener() {
+		this.busEvents.forEach(event => this.eventBus.unsubscribe(event, {}));
+        this.customBusEvents.forEach((object) => this.eventBus.unsubscribe(object.custom_name, {}));
 	}
-
-    publish(name, data) {
-        var handlers = this.events[name];
-
-        if (!!handlers === false) {
-            return;
-        }
-
-        handlers.forEach((handler) => handler.call(this, data));
-    }
-
-    subscribe(name, handler) {
-        var handlers = this.events[name];
-
-        if (!!handlers === false) {
-            handlers = this.events[name] = [];
-        } 
-
-        handlers.push(handler);
-    }
-
-    unsubscribe(name, handler) {
-        var handlers = this.events[name];
-
-        if (!!handlers === false) {
-            return;
-        } 
-
-		handlers.splice(handlers.indexOf(handler));
-    }
 }
 
-module.exports = { WebSocket, EventBus };
+module.exports = { WebSocket };