bruce-models 0.9.4 → 0.9.6

package/dist/bruce-models.umd.js

@@ -755,34 +755,35 @@
     (function (MessageBroker) {
         let EAction;
         (function (EAction) {
+            // Subscribes a client to topic messages on a server side.
             EAction["SUBSCRIBE"] = "subscribe";
+            // Subscribes a client to a topic without notifying other clients.
             EAction["SUBSCRIBE_SHADOW"] = "subscribeShadow";
+            // Unsubscribes clients from topic messages on a server side
             EAction["UNSUBSCRIBE"] = "unsubscribe";
+            // Sends a message to all topic subscribers.
             EAction["BROADCAST"] = "broadcast";
-            EAction["GET_TOPIC_SUBSCRIBERS"] = "getTopicSubscribers"; // requests topic subscribers without subscribing
+            // Requests topic subscribers without subscribing.
+            EAction["GET_TOPIC_SUBSCRIBERS"] = "getTopicSubscribers";
         })(EAction = MessageBroker.EAction || (MessageBroker.EAction = {}));
-        /** Events types any component may get from server */
-        let EEvent;
-        (function (EEvent) {
-            EEvent["SAVED"] = "saved";
-            EEvent["UPDATED"] = "updated";
-            EEvent["DELETED"] = "deleted";
-            EEvent["EDIT_STARTED"] = "editStarted";
-            EEvent["EDIT_FINISHED"] = "editFinished";
-            EEvent["USERS_UPDATE"] = "usersUpdate";
-        })(EEvent = MessageBroker.EEvent || (MessageBroker.EEvent = {}));
         /**
          * Communicates with a server message broker.
          */
         class WebSocketBroker {
             constructor(uri, env) {
-                this.uri = uri;
-                this.env = env;
                 this.subscriptions = new Map();
                 this.reconnects = 0;
                 this.maxReconnects = 5;
+                this.uri = uri;
+                this.env = env ? env : exports.Api.EEnv.PROD;
                 this.connect();
             }
+            get IsConnected() {
+                return this.ws.readyState === WebSocket.OPEN;
+            }
+            SetUserId(userId) {
+                this.userId = this.userId ? this.userId : userId;
+            }
             connect() {
                 try {
                     if (!WebSocket) {
@@ -802,9 +803,6 @@
                 const ws = document.location.protocol === "https:" ? "wss" : "ws";
                 return uri.replace(/^(https|http)/, ws) + "websocket";
             }
-            SetUser(user) {
-                this.user = this.user ? this.user : user;
-            }
             onOpen(ev) {
                 if (this.env === exports.Api.EEnv.DEV) {
                     console.log("MessageBroker connection opened: ", ev);
@@ -834,55 +832,45 @@
                 }
                 subscribers.push(callback);
                 this.subscriptions.set(topic, subscribers);
-                if (this.env === exports.Api.EEnv.DEV) {
-                    console.groupCollapsed("MessageBroker subscription added: ", topic);
-                    console.table(Array.from(this.subscriptions.entries()));
-                    console.groupEnd();
-                }
             }
             /**
              * Send message to server.
-             * @param msg
+             * @param base
              * @returns
              */
-            sendMessage(msg) {
+            SendMessage(base) {
                 if (this.ws.readyState !== WebSocket.OPEN) {
                     return;
                 }
-                if (!this.user) {
-                    console.error("Set user first!");
-                }
                 try {
-                    const outgoingMessage = Object.assign(Object.assign({}, msg), { user: this.user, time: Date.now() });
+                    const msg = base;
+                    if (!msg.event) {
+                        msg.event = EAction.BROADCAST;
+                    }
+                    let message = base.data ? base.data : {};
+                    if (typeof message == "object") {
+                        message = JSON.stringify(message);
+                    }
+                    msg.data = message;
+                    const outgoingMessage = Object.assign(Object.assign({}, msg), { user: this.userId, time: Date.now() });
                     this.ws.send(JSON.stringify(outgoingMessage));
                 }
                 catch (e) {
                     console.warn(e);
                 }
             }
-            get IsConnected() {
-                return this.ws.readyState === WebSocket.OPEN;
-            }
             /**
              * Add a subscriber to a topic.
              * @param topic
              * @param callback
              * @param action
              */
-            Subscribe(topic, callback, action = EAction.SUBSCRIBE) {
-                this.addSubscriber(topic, callback);
-                this.sendMessage({ topic, action });
-                if (this.env === exports.Api.EEnv.DEV) {
-                    console.log(`Subscribe [${action}] called for topic`, topic);
+            Subscribe(topic, callback, action) {
+                if (!action) {
+                    action = EAction.SUBSCRIBE;
                 }
-            }
-            /**
-             * Add a shadow subscriber to a topic.
-             * @param topic
-             * @param callback
-             */
-            SubscribeShadow(topic, callback) {
-                this.Subscribe(topic, callback, EAction.SUBSCRIBE_SHADOW);
+                this.addSubscriber(topic, callback);
+                this.SendMessage({ topic, action });
             }
             /**
              * Remove a subscriber from a topic.
@@ -892,19 +880,11 @@
             Unsubscribe(topic, callback) {
                 const subscribers = this.subscriptions.get(topic) || [];
                 this.subscriptions.set(topic, subscribers.filter(fn => fn != callback));
-                this.sendMessage({ topic, action: EAction.UNSUBSCRIBE });
-                if (this.env === exports.Api.EEnv.DEV) {
-                    console.groupCollapsed("MessageBroker subscription removed: ", topic);
-                    console.table(Array.from(this.subscriptions.entries()));
-                    console.groupEnd();
-                }
-            }
-            SendBroadcastMessage(msg) {
-                this.sendMessage(Object.assign(Object.assign({}, msg), { action: EAction.BROADCAST }));
+                this.SendMessage({ topic, action: EAction.UNSUBSCRIBE });
             }
             RequestTopicUsers(topic, callback) {
                 this.addSubscriber(topic, callback);
-                this.sendMessage({ topic, action: EAction.GET_TOPIC_SUBSCRIBERS });
+                this.SendMessage({ topic, event: EAction.GET_TOPIC_SUBSCRIBERS });
             }
         }
         MessageBroker.WebSocketBroker = WebSocketBroker;