@quotemedia.com/streamer 2.27.0 → 2.33.0

package/{qmci-streamer-2.27.0.js → qmci-streamer-2.33.0.js}

@@ -22,12 +22,30 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var Connection = function () {
     function Connection(createTransmitter, openSocket, log) {
+        var maxReconnectAttempts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 3;
+
         _classCallCheck(this, Connection);
 
         this.openSocket = openSocket;
         this.createTransmitter = createTransmitter;
         this.log = (0, _logging.asLogger)(log);
         this.events = new _EventSupport2["default"](this);
+        this.currentConn = '';
+        //Max number of times that the client will try to reopen per loop
+        this.maxReconnectAttempts = maxReconnectAttempts;
+        //Max number of times client will be able to try to reopen in total. Once this is reached, client will close and no reconnect will be attempted.
+        //probably means that an unhandled loop was reached
+        this.maxReconnectsTotal = 3;
+        this.isFirstConnection = true;
+        this.atmoCodes = {
+            1000: "Normal closure; the connection successfully completed whatever purpose for which it was created.",
+            1001: "The endpoint is going away, either because of a server failure or because the browser is navigating away from the page that opened the connection.",
+            1002: "The endpoint is terminating the connection due to a protocol error.",
+            1003: "The connection is being terminated because the endpoint received data of a type it cannot accept (for example, a text-only endpoint received binary data).",
+            1004: "The endpoint is terminating the connection because a data frame was received that is too large.",
+            1005: "Unknown: no status code was provided even though one was expected.",
+            1006: "Connection was closed abnormally (that is, with no close frame being sent)."
+        };
     }
 
     Connection.prototype.open = function open() {
@@ -39,17 +57,32 @@ var Connection = function () {
             }
         };
 
-        this.transmitter = this.createTransmitter(socketProxy);
-        this.transmitter.on("sequence", function (seq) {
-            _this.events.fire("sequence", seq);
-        }).on("message", function (message) {
-            _this.events.fire("message", message);
-        });
-
+        //Check to avoid creating unnecessary events and objects
+        if (this.isFirstConnection) {
+            this.on("reopen", function (e) {
+                if (_this.isConnectionUp) {
+                    var prevConn = _this.currentConn;
+                    _this.currentConn = e.connectionId;
+                    _this.events.fire("reconnect", events.event("Reconnection success", {
+                        previousConnectionId: prevConn,
+                        currentConnectionId: _this.currentConn
+                    }));
+                } else {
+                    _this.events.fire("error", e);
+                }
+            });
+            this.transmitter = this.createTransmitter(socketProxy);
+            this.transmitter.on("sequence", function (seq) {
+                _this.events.fire("sequence", seq);
+            }).on("message", function (message) {
+                _this.events.fire("message", message);
+            });
+        }
         this.socket = this.openSocket(function (request) {
             _this.request = request;
             var url = request.url;
 
+            _this.reconnect = false;
             return {
                 onMessage: function onMessage(response) {
                     _this.transmitter.onMessage(response.responseBody);
@@ -58,22 +91,25 @@ var Connection = function () {
                     _this.transmitter.onMessage(response.responseBody);
                 },
                 onOpen: function onOpen(response) {
+                    var code = response.status;
+                    if (code !== 200) {
+                        _this.reconnect = false;
+                    } else {
+                        _this.isConnectionUp = true;
+                    }
                     var e = events.event("open", {
                         url: url,
-                        code: response.status,
-                        transport: response.transport
+                        code: code,
+                        transport: response.transport,
+                        connectionId: response.request.uuid
                     });
                     _this.log.info(e);
                     _this.events.fire("open", e);
-                },
-                onReopen: function onReopen(response) {
-                    var e = events.event("reopen", {
-                        url: url,
-                        status: response.code,
-                        transport: response.transport
-                    });
-                    response.maxReconnectOnClose--;
-                    _this.log.info(e);
+                    if (!_this.isFirstConnection) {
+                        _this.maxReconnectsTotal--;
+                        _this.events.fire("reopen", e);
+                    }
+                    _this.currentConn = response.request.uuid;
                 },
                 onTransportFailure: function onTransportFailure(reason, request) {
                     var e = events.error("Transport failure", {
@@ -84,6 +120,9 @@ var Connection = function () {
                     });
                     _this.log.error(reason);
                     _this.events.fire("error", e);
+                    if (_this.isReconnect()) {
+                        _this.reconnect = true;
+                    }
                 },
                 onError: function onError(response) {
                     var reason = response.reason || response.reasonPhrase;
@@ -106,18 +145,35 @@ var Connection = function () {
                 onClose: function onClose(response) {
                     var code = response.status;
                     var reason = response.reason || response.reasonPhrase;
+                    var atmosphereMessage = response.atmoMessage;
                     // For whatever reason, Atmosphere sets to 408 when unsubscribing (e.g., when refreshing the page)
                     if (code === 408 && response.state === "unsubscribe") {
                         code = 200;
                         reason = "Unsubscribed";
                     }
-
+                    //When 501 code is sent it could mean that the server is down, therefore do not continue trying to reconnect
+                    if (code === 501 || code === 401 || code === 403 || code === 452) {
+                        _this.log.warn("Unable to reconnect with code: " + code + ", reason: " + reason);
+                        _this.reconnect = false;
+                    }
+                    if (atmosphereMessage && atmosphereMessage.code in _this.atmoCodes) {
+                        _this.log.error("Unexpected close. Code: " + atmosphereMessage.code + " Reason: " + _this.atmoCodes[atmosphereMessage.code]);
+                        _this.events.fire("atmoError", events.error("Atmosphere error", {
+                            reason: _this.atmoCodes[atmosphereMessage.code],
+                            code: atmosphereMessage.code
+                        }));
+                        code = 410;
+                        reason = "Gone";
+                    }
                     var e = events.close({
                         url: url,
                         transport: response.transport,
                         code: code,
                         reason: reason
                     });
+                    _this.isConnectionUp = false;
+                    //Need to reset this value since it seems to be causing issues with resubscribing
+                    response.request.uuid = 0;
                     _this.log.info(e);
                     _this.events.fire("close", e);
                 },
@@ -126,11 +182,13 @@ var Connection = function () {
                         timesExceeded: response.timesExceeded,
                         maxExceeded: response.maxExceed
                     });
+                    _this.reconnect = false;
+                    _this.log.warn("Slow connection received, Reconnection will not be attempted.");
                     _this.log.info(e);
                     _this.events.fire("slow", e);
                 }
             };
-        });
+        }, this.currentConn);
     };
 
     Connection.prototype.close = function close() {
@@ -138,6 +196,9 @@ var Connection = function () {
             try {
                 this.socket.close();
                 this.socket = null;
+                if (this.reconnect) {
+                    this.tryReopen();
+                }
             } catch (err) {
                 this.events.fire("error", events.error("Error closing", {
                     reason: err.message,
@@ -148,6 +209,44 @@ var Connection = function () {
         }
     };
 
+    Connection.prototype.tryReopen = function tryReopen() {
+        var _this2 = this;
+
+        if (this.isConnectionUp || this.maxReconnectsTotal <= 0) {
+            this.log.error("Connection is already open or max reconnects was reached, won't try to reconnect");
+            return;
+        }
+        this.isFirstConnection = false;
+        var currentAttempts = this.maxReconnectAttempts;
+        // Recursively run this until a successful open is completed
+        var reconnect = function reconnect() {
+            if (currentAttempts <= 0) {
+                _this2.reconnect = false;
+                _this2.log.error("Error while reconnecting. No attempts left.");
+                //if maxattempts was reached and no connection was open, exit.
+                _this2.maxReconnectAttempts = 0;
+                return;
+            }
+            if (_this2.isConnectionUp || !_this2.reconnect) {
+                return;
+            }
+            _this2.log.info("Attempting reconnect. Attempts left: " + currentAttempts);
+            _this2.reopen(currentAttempts);
+            currentAttempts--;
+            setTimeout(reconnect, 500);
+        };
+        setTimeout(reconnect, 500);
+    };
+
+    Connection.prototype.reopen = function reopen(attempt) {
+        try {
+            this.open();
+        } catch (exception) {
+            this.log.warn("There was an error while reopening attempt #" + attempt);
+            this.events.fire("error", exception);
+        }
+    };
+
     Connection.prototype.send = function send(message) {
         try {
             this.transmitter.send(message);
@@ -160,6 +259,14 @@ var Connection = function () {
         }
     };
 
+    Connection.prototype.isReconnect = function isReconnect() {
+        return this.request.headers['x-Stream-isReconnect'];
+    };
+
+    Connection.prototype.setReconnect = function setReconnect(doReconnect) {
+        this.reconnect = doReconnect;
+    };
+
     Connection.prototype.setServer = function setServer(server) {
         this.request.headers['X-Stream-Instance'] = server;
     };
@@ -444,6 +551,10 @@ var Stream = function () {
                 _this.pendingConnection(err);
             }
             _this.events.fire("error", err);
+        }).on("reconnect", function (msg) {
+            _this.reconnectSuccess(msg);
+        }).on("atmoError", function (err) {
+            _this.events.fire("atmoError", err);
         });
 
         this.requestid = new _UShortId2["default"]();
@@ -456,6 +567,7 @@ var Stream = function () {
         this.pendingNewsUnsubscriptions = {};
         this.pendingAlertSubscription = {};
         this.pendingTradeSubscription = {};
+        this.pendingTradeUnsubscription = {};
 
         this.on("error", function (err) {
             _this.log.warn(err);
@@ -473,6 +585,11 @@ var Stream = function () {
         }
     };
 
+    Stream.prototype.reconnectSuccess = function reconnectSuccess(msg) {
+        this.events.fire("reconnectSuccess", msg);
+        this.log.info("Successfull reconnection. Previous Id: " + msg.previousConnectionId + " Current Id = " + msg.currentConnectionId);
+    };
+
     Stream.prototype.on = function on(event, listener) {
         return this.events.on(event, listener);
     };
@@ -653,7 +770,7 @@ var Stream = function () {
         this.send(request);
     };
 
-    Stream.prototype.subscribeTrade = function subscribeTrade(operation, optsOrCallback, callbackOrNothing) {
+    Stream.prototype.subscribeTrade = function subscribeTrade(notificationType, optsOrCallback, callbackOrNothing) {
         var opts = optsOrCallback && typeof optsOrCallback !== "function" ? optsOrCallback : null;
         var callback = callbackOrNothing ? callbackOrNothing : optsOrCallback && typeof optsOrCallback === "function" ? optsOrCallback : null;
 
@@ -671,11 +788,11 @@ var Stream = function () {
             mimetype: this.format,
             callback: callback,
             result: {
-                operation: ""
+                notificationType: ""
             }
         };
 
-        var request = this.buildTradeSubscribeRequest(operation, tradeSub);
+        var request = this.buildTradeSubscribeRequest(notificationType, tradeSub, _streamerApi.messages.control.Action.SUBSCRIBE);
         var id = this.requestid.next();
         tradeSub.id.push(id);
         this.pendingTradeSubscription[id] = tradeSub;
@@ -889,6 +1006,37 @@ var Stream = function () {
         this.send(request);
     };
 
+    Stream.prototype.unsubscribeTrade = function unsubscribeTrade(notificationType, optsOrCallback, callbackOrNothing) {
+        var opts = optsOrCallback && typeof optsOrCallback !== "function" ? optsOrCallback : null;
+        var callback = callbackOrNothing ? callbackOrNothing : optsOrCallback && typeof optsOrCallback === "function" ? optsOrCallback : null;
+
+        if (this.isClosed()) {
+            var event = events.error("Stream is disconnected", {
+                code: -1,
+                reason: "Already disconnected"
+            });
+            this.events.fire("error", event);
+            return;
+        }
+
+        var tradeSub = {
+            id: [],
+            mimetype: this.format,
+            callback: callback,
+            result: {
+                notificationType: ""
+            }
+        };
+
+        var request = this.buildTradeSubscribeRequest(notificationType, tradeSub, _streamerApi.messages.control.Action.UNSUBSCRIBE);
+        var id = this.requestid.next();
+        tradeSub.id.push(id);
+        this.pendingTradeUnsubscription[id] = tradeSub;
+        request.id = id;
+
+        this.send(request);
+    };
+
     Stream.prototype._handlejsonmsg = function _handlejsonmsg(msg) {
         if ((0, _streamerUtils.iscontrolmessage)(msg)) {
             this.handlectrlmsg(msg);
@@ -969,9 +1117,10 @@ var Stream = function () {
         return msg;
     };
 
-    Stream.prototype.buildTradeSubscribeRequest = function buildTradeSubscribeRequest(operation, sub) {
+    Stream.prototype.buildTradeSubscribeRequest = function buildTradeSubscribeRequest(notificationType, sub, action) {
         var msg = new _streamerApi.messages.control.TradeSubscribeMessage();
-        msg.operation = operation;
+        msg.action = action;
+        msg.notificationType = notificationType;
         msg.mimetype = sub.mimetype;
         return msg;
     };
@@ -1030,6 +1179,9 @@ var Stream = function () {
             case _streamerApi.messages.MessageTypeNames.ctrl.NEWS_CMD_FILTER_RESPONSE:
                 this.onNewsCmdFilterResponse(msg);
                 break;
+            case _streamerApi.messages.MessageTypeNames.ctrl.TRADE_UNSUBSCRIBE_RESPONSE:
+                this.onTradeUnsubscribeResponse(msg);
+                break;
             case _streamerApi.messages.MessageTypeNames.ctrl.CONNECT_RESPONSE:
                 this.onConnectResponse(msg);
                 break;
@@ -1048,6 +1200,12 @@ var Stream = function () {
             case _streamerApi.messages.MessageTypeNames.ctrl.RESUBSCRIBE_MESSAGE:
                 this.onResubscribeMessage(msg);
                 break;
+            case _streamerApi.messages.MessageTypeNames.ctrl.RECONNECT_RESPONSE:
+                this.onReconnectMessage(msg);
+                break;
+            case _streamerApi.messages.MessageTypeNames.ctrl.MISSED_DATA_SENT:
+                this.onMissedDataSent(msg);
+                break;
         }
     };
 
@@ -1320,9 +1478,9 @@ var Stream = function () {
 
         var result = tradeSub.result;
 
-        if (msg.operation) {
-            this.log.debug('Trade ' + msg.operation);
-            result.operation = msg.operation;
+        if (msg.notificationType) {
+            this.log.debug('Trade ' + msg.notificationType);
+            result.notificationType = msg.notificationType;
         }
 
         if (tradeSub.id.length === 0) {
@@ -1381,6 +1539,41 @@ var Stream = function () {
         }
     };
 
+    Stream.prototype.onTradeUnsubscribeResponse = function onTradeUnsubscribeResponse(msg) {
+        var tradeSub = this.pendingTradeUnsubscription[msg.__id];
+        var callback = tradeSub.callback;
+
+        (0, _utils.removeFromArray)(tradeSub.id, msg.__id);
+        delete this.pendingTradeUnsubscription[msg.__id];
+
+        console.log(msg);
+        if (msg.code != 200 && !tradeSub.failed) {
+            tradeSub.failed = true;
+            var event = events.error("Error unsubscribing", {
+                code: msg.code,
+                reason: msg.reason
+            });
+            this.events.fire("error", event);
+            if (callback) {
+                tradeSub.callback(event);
+            }
+            return;
+        }
+
+        var result = tradeSub.result;
+
+        if (msg.notificationType) {
+            this.log.debug('Trade ' + msg.notificationType);
+            result.notificationType = msg.notificationType;
+        }
+
+        if (tradeSub.id.length === 0) {
+            if (callback) {
+                callback(null, tradeSub.result);
+            }
+        }
+    };
+
     Stream.prototype.onNewsCmdFilterRefreshResponse = function onNewsCmdFilterRefreshResponse(msg) {
         console.log("msg", msg);
         if (msg.code != 200) {
@@ -1472,8 +1665,18 @@ var Stream = function () {
         }
     };
 
+    Stream.prototype.onReconnectMessage = function onReconnectMessage(msg) {
+        if (msg.code === 450) {
+            this.events.fire("slow", "Reconnection recieved a slow code: " + msg.code);
+            this._isSlowConnection = true;
+            this.conn.setReconnect = false;
+        }
+        this.events.fire("reconnectMessage", msg);
+        console.log(msg);
+    };
+
     Stream.prototype.onConnectResponse = function onConnectResponse(msg) {
-        if (msg.code != 200) {
+        if (msg.code !== 200) {
             var event = events.error("Connection failed", {
                 code: msg.code,
                 reason: msg.reason
@@ -1541,6 +1744,11 @@ var Stream = function () {
         this.events.fire("resubscribeMessage", msg);
     };
 
+    Stream.prototype.onMissedDataSent = function onMissedDataSent(msg) {
+        this.log.debug(_formatting.msgfmt.fmt(msg));
+        this.events.fire("missedDataSent", msg);
+    };
+
     Stream.prototype._handledatamsg = function _handledatamsg(msg) {
         this.events.fire("message", msg);
     };
@@ -1556,8 +1764,29 @@ var Stream = function () {
         if (!this.isClosed()) {
             var conn = this.conn;
             this.conn = null;
-            this.events.fire("close", msg);
             conn.close();
+            this.events.fire("close", msg);
+            if (conn.isReconnect()) {
+                //Will need to reset the events since they duplicate each time it reconnects.
+                this.events = new _EventSupport2["default"]();
+                this.conn = conn;
+            }
+        }
+    };
+
+    Stream.prototype.performReconnect = function performReconnect(callback) {
+        if (this.conn != null && this.conn.isReconnect()) {
+            if (this.conn.isConnectionUp) {
+                this.log.warn("Connection is not closed and won't try reconnect.");
+                return;
+            }
+            this.conn.setReconnect(true);
+            this.conn.tryReopen();
+            if (callback) {
+                callback();
+            }
+        } else {
+            this.log.warn("Reconnect flag is set to false");
         }
     };
 
@@ -1658,30 +1887,24 @@ Object.assign(Streamer, {
     },
 
     openStomp: function openStomp(_config, callback) {
-        // Note: only turn on stomp connection in Local and QA
-        var stompHostConfig = ["http://localhost:7000", "https://qa.quotemedia.com/cache"];
-        if (stompHostConfig.includes(_config.host)) {
-            initLogger();
+        initLogger();
 
-            var credentials = void 0;
-            try {
-                credentials = (0, _AuthService.asCredentials)(_config.credentials);
-            } catch (e) {
-                callback(e);
-                return;
-            }
+        var credentials = void 0;
+        try {
+            credentials = (0, _AuthService.asCredentials)(_config.credentials);
+        } catch (e) {
+            callback(e);
+            return;
+        }
 
-            var hostProtocol = _config.host.split('//');
-            var wsProtocol = hostProtocol[0] === "http:" ? "ws://" : "wss://";
-            var config = Object.assign({}, _config);
-            config.credentials = credentials;
-            config.format = config.format || "application/json";
-            config.url = wsProtocol + hostProtocol[1];
+        var hostProtocol = _config.host.split('//');
+        var wsProtocol = hostProtocol[0] === "http:" ? "ws://" : "wss://";
+        var config = Object.assign({}, _config);
+        config.credentials = credentials;
+        config.format = config.format || "application/json";
+        config.url = wsProtocol + hostProtocol[1];
 
-            new _StompStreamingService2["default"](_http2["default"], _stomp2["default"], logger, config).openStompStream(callback);
-        } else {
-            callback("ERROR: Stomp Connection is only turn on in Local and QA");
-        }
+        new _StompStreamingService2["default"](_http2["default"], _stomp2["default"], logger, config).openStompStream(callback);
     },
 
     ping: function ping(host, callback) {
@@ -1761,6 +1984,7 @@ var StreamingService = function () {
         this.atmo = atmosphere;
         this.log = (0, _logging.asLogger)(log);
         this.config = config || {};
+        this.maxReconnectAttempts = this.config.maxReconnectAttempts;
 
         this.format = this.config.format;
         if (this.config.format === 'application/json') {
@@ -1786,7 +2010,7 @@ var StreamingService = function () {
         }
     }
 
-    StreamingService.prototype.openSocket = function openSocket(handlers) {
+    StreamingService.prototype.openSocket = function openSocket(handlers, connectionId) {
         var headers = {
             'X-Stream-Version': _streamerApi.VERSION,
             'X-Stream-Lib': _streamerApi.LIBRARY_NAME
@@ -1797,6 +2021,9 @@ var StreamingService = function () {
             headers['X-Stream-Conflation'] = _conflation;
         }
 
+        if (connectionId != null && connectionId !== '') {
+            headers['X-Stream-Previous-Connection-Id'] = connectionId;
+        }
         var _rejectExcessiveConnection = this.config.rejectExcessiveConnection;
         if (_rejectExcessiveConnection != null && _rejectExcessiveConnection !== '') {
             headers['X-Stream-Reject'] = _rejectExcessiveConnection;
@@ -1815,6 +2042,27 @@ var StreamingService = function () {
             headers['X-Stream-UpdatesOnly'] = true;
         }
 
+        var _isReconnect = this.config.isReconnect;
+        if (_isReconnect != null && _isReconnect !== '') {
+            headers['x-Stream-isReconnect'] = _isReconnect;
+        }
+
+        var _alwaysReconnect = this.config.alwaysReconnect;
+        if (_alwaysReconnect != null && _alwaysReconnect !== '') {
+            headers['x-Stream-isAlwaysReopen'] = _alwaysReconnect;
+        }
+
+        if (this.config.isMissedData === 'ALL') {
+            headers['X-Stream-isReceiveAllMissedData'] = true;
+        } else if (this.config.isMissedData === 'LATEST') {
+            headers['X-Stream-isReceiveLatestMissedData'] = true;
+        }
+
+        var _connectionFrom = this.config.connectionFrom;
+        if (_connectionFrom != null) {
+            headers['X-Stream-connectionFrom'] = _connectionFrom;
+        }
+
         Object.assign(headers, this.config.credentials.getHeaders());
 
         var request = {
@@ -1846,9 +2094,9 @@ var StreamingService = function () {
 
         return new _Connection2["default"](function (socket) {
             return _this2.createTransmitter(socket);
-        }, function (handlers) {
-            return _this2.openSocket(handlers);
-        }, this.logger);
+        }, function (handlers, connectionId) {
+            return _this2.openSocket(handlers, connectionId);
+        }, this.log, this.maxReconnectAttempts);
     };
 
     StreamingService.prototype.openStream = function openStream(callback) {
@@ -3448,7 +3696,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
                         return;
                     }
 
-                    _invokeClose(webSocketOpened);
+                    //Patched by Quotemedia
+                    _invokeClose(webSocketOpened, message);
 
                     _response.state = 'closed';
 
@@ -4771,11 +5020,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
                 }
             }
 
-            function _invokeClose(wasOpen) {
+            //Patched by Quotemedia
+            function _invokeClose(wasOpen, message) {
                 if (_response.state !== 'closed') {
                     _response.state = 'closed';
                     _response.responseBody = "";
                     _response.messages = [];
+                    _response.atmoMessage = message;
                     _response.status = !wasOpen ? 501 : 200;
                     _invokeCallback();
                 }
@@ -5558,6 +5809,7 @@ var EnduserAuthService = function () {
         this.http = http;
         this.host = config.host || "app.quotemedia.com";
         this.credentials = credentials;
+        this.application = config.application;
         this.method = "POST";
     }
 
@@ -5566,7 +5818,7 @@ var EnduserAuthService = function () {
     };
 
     EnduserAuthService.prototype.login_POST = function login_POST(callback) {
-        var url = this.host + AUTHSERVICEURLS.authenticate_post;
+        var url = this.host + AUTHSERVICEURLS.authenticate_post + (this.application ? "&application=" + this.application : "");
         var req = {
             wmId: this.credentials.wmid,
             username: this.credentials.username,
@@ -5666,6 +5918,9 @@ fmt.Formatter = function () {
     this.formatters[_streamerApi.messages.MessageTypeNames.ctrl.NEWS_UNSUBSCRIBE_RESPONSE] = this._fmtnewsunsubscriberesponse;
     this.formatters[_streamerApi.messages.MessageTypeNames.ctrl.NEWS_CMD_FILTER_REFRESH_RESPONSE] = this._fmtnewscmdfilterrefreshresponse;
     this.formatters[_streamerApi.messages.MessageTypeNames.ctrl.NEWS_CMD_FILTER_RESPONSE] = this._fmtnewscmdfilterresponse;
+    this.formatters[_streamerApi.messages.MessageTypeNames.ctrl.TRADE_UNSUBSCRIBE_RESPONSE] = this._fmttradeunsubscriberesponse;
+    this.formatters[_streamerApi.messages.MessageTypeNames.ctrl.RECONNECT_RESPONSE] = this._fmtreconnectresponse;
+    this.formatters[_streamerApi.messages.MessageTypeNames.ctrl.MISSED_DATA_SENT] = this._fmtmisseddatasent;
 
     //
     this.formatters[_streamerApi.messages.MessageTypeNames.data.QUOTE] = this._fmtquote;
@@ -5689,6 +5944,7 @@ fmt.Formatter = function () {
     this.formatters[_streamerApi.messages.MessageTypeNames.data.TRADENOTIFICATION] = this._fmttradeNotification;
     this.formatters[_streamerApi.messages.MessageTypeNames.data.NEWSCMDFILTER] = this._fmtnewscmdfilter;
     this.formatters[_streamerApi.messages.MessageTypeNames.data.NEWSERROR] = this._fmtnewserror;
+    this.formatters[_streamerApi.messages.MessageTypeNames.data.DIVIDEND] = this._fmtdividend;
 };
 
 fmt.Formatter._UNKOWNTYPE = '__UNKNOWN__';
@@ -5817,6 +6073,8 @@ fmt.Formatter.prototype._fmtpricedata = function (val) {
     s.append(val.postMarketPercentChange);
     s.sep();
     s.append(val.lastTradeExcode);
+    s.sep();
+    s.append(val.currencyID);
     return s.toString();
 };
 fmt.Formatter.prototype._fmtlastsale = function (val) {
@@ -6321,6 +6579,33 @@ fmt.Formatter.prototype._fmtnewserror = function (val) {
     return s.toString();
 };
 
+fmt.Formatter.prototype._fmtdividend = function (val) {
+    var s = new fmt.StringBuilder();
+    s.append("DV");
+    s.sep();
+    s.datetime(val.occuredOn);
+    s.sep();
+    s.append(val.symbolId);
+    s.sep();
+    s.append(val.instrument);
+    s.sep();
+    s.datetime(val.declarationDate);
+    s.sep();
+    s.datetime(val.executionDate);
+    s.sep();
+    s.datetime(val.recordDate);
+    s.sep();
+    s.datetime(val.paymentDate);
+    s.sep();
+    s.append(val.amount);
+    s.sep();
+    s.append(val.frequency);
+    s.sep();
+    s.append(val.paymentType);
+
+    return s.toString();
+};
+
 fmt.Formatter.prototype._fmtheartbeat = function (val) {
     var s = new fmt.StringBuilder();
     s.append("HEARBEAT");
@@ -6456,6 +6741,13 @@ fmt.Formatter.prototype._fmtexchangeunsubscriberesponse = function (val) {
     return s.toString();
 };
 
+fmt.Formatter.prototype._fmttradeunsubscriberesponse = function (val) {
+    var s = new fmt.StringBuilder();
+    s.append('TRADE UNSUBSCRIBED');
+    // TODO
+    return s.toString();
+};
+
 fmt.Formatter.prototype._fmtconnectresponse = function (val) {
     var s = new fmt.StringBuilder();
     s.append('CONNECT');
@@ -6476,6 +6768,28 @@ fmt.Formatter.prototype._fmtconnectresponse = function (val) {
     return s.toString();
 };
 
+fmt.Formatter.prototype._fmtreconnectresponse = function (val) {
+    var s = new fmt.StringBuilder();
+    s.append('RECONNECT');
+    s.sep();
+    s.append(val.version);
+    s.sep();
+    s.append(val.flowControlCheckInterval);
+    s.sep();
+    s.append(val.serverInstance);
+    s.sep();
+    s.append(val.conflationMs);
+    s.sep();
+    s.append(val.rejectExcessiveConnection);
+    s.sep();
+    s.append(val.maxEntitlementsPerSubscription);
+    s.sep();
+    s.sep(val.entitlements);
+    s.sep();
+    s.sep(val.exchangeEntitlements);
+    return s.toString();
+};
+
 fmt.Formatter.prototype._fmtconnectionclose = function (val) {
     var s = new fmt.StringBuilder();
     s.append('CLOSE');
@@ -6565,6 +6879,20 @@ fmt.Formatter.prototype.__baseresponse = function (val, s) {
     s.append(val.reason);
 };
 
+fmt.Formatter.prototype._fmtmisseddatasent = function (val) {
+    var s = new fmt.StringBuilder();
+    s.append("MISSED DATA SENT");
+    s.sep();
+    s.datetime(val.timestamp);
+    s.sep();
+    s.append(val.requestId);
+    s.sep();
+    s.append(val.totalDataSent);
+    s.sep();
+    s.append(val.totalDataHeld);
+    return s.toString();
+};
+
 /**
  * Create a new sting builder.
  * @constructor
@@ -10242,6 +10570,7 @@ var PricedataDecoder = function () {
         out.postMarketChange = _Qitch2["default"].dec8double(src, offset + def.POSTMARKETCHANGE_OFFSET);
         out.postMarketPercentChange = this._postmarketPercentChange(out);
         out.lastTradeExcode = _Qitch2["default"].excode(src, offset + def.LASTTRADEEXCODE_OFFSET);
+        out.currencyID = _Qitch2["default"].currencyid(src, offset + def.CURRENCYID_OFFSET);
 
         return out;
     };
@@ -11159,7 +11488,7 @@ var LENGTH = exports.LENGTH = SELLBLOCKTRANSACTIONS_OFFSET + _QitchConstants.INT
 "use strict";
 
 exports.__esModule = true;
-exports.PricedataFlags = exports.LENGTH = exports.DECIMALLASTTRADESIZE_OFFSET = exports.DECIMALPOSTMARKETVOLUME_OFFSET = exports.DECIMALPREMARKETVOLUME_OFFSET = exports.DECIMALACCUMULATEDVOLUME_OFFSET = exports.LASTTRADEEXCODE_OFFSET = exports.POSTMARKETCHANGE_OFFSET = exports.POSTMARKETVOLUME_OFFSET = exports.POSTMARKETLASTPRICE_OFFSET = exports.POSTMARKETTRADETIME_OFFSET = exports.PREMARKETCHANGE_OFFSET = exports.PREMARKETVOLUME_OFFSET = exports.PREMARKETLASTPRICE_OFFSET = exports.PREMARKETTRADETIME_OFFSET = exports.TWAP_OFFSET = exports.VWAP_OFFSET = exports.FLAGS_OFFSET = exports.ACCUMULATEDTRADEVALUE_OFFSET = exports.TRADECOUNT_OFFSET = exports.CLOSE_OFFSET = exports.LASTTRADESIZE_OFFSET = exports.TICK_OFFSET = exports.LASTTRADETIME_OFFSET = exports.ACCUMULATEDVOLUME_OFFSET = exports.LOW_OFFSET = exports.HIGH_OFFSET = exports.OPEN_OFFSET = exports.PREVCLOSE_OFFSET = exports.LAST_OFFSET = exports.SYMBOL_OFFSET = exports.TIMESTAMP_OFFSET = exports.TYPEID = undefined;
+exports.PricedataFlags = exports.LENGTH = exports.CURRENCYID_OFFSET = exports.DECIMALLASTTRADESIZE_OFFSET = exports.DECIMALPOSTMARKETVOLUME_OFFSET = exports.DECIMALPREMARKETVOLUME_OFFSET = exports.DECIMALACCUMULATEDVOLUME_OFFSET = exports.LASTTRADEEXCODE_OFFSET = exports.POSTMARKETCHANGE_OFFSET = exports.POSTMARKETVOLUME_OFFSET = exports.POSTMARKETLASTPRICE_OFFSET = exports.POSTMARKETTRADETIME_OFFSET = exports.PREMARKETCHANGE_OFFSET = exports.PREMARKETVOLUME_OFFSET = exports.PREMARKETLASTPRICE_OFFSET = exports.PREMARKETTRADETIME_OFFSET = exports.TWAP_OFFSET = exports.VWAP_OFFSET = exports.FLAGS_OFFSET = exports.ACCUMULATEDTRADEVALUE_OFFSET = exports.TRADECOUNT_OFFSET = exports.CLOSE_OFFSET = exports.LASTTRADESIZE_OFFSET = exports.TICK_OFFSET = exports.LASTTRADETIME_OFFSET = exports.ACCUMULATEDVOLUME_OFFSET = exports.LOW_OFFSET = exports.HIGH_OFFSET = exports.OPEN_OFFSET = exports.PREVCLOSE_OFFSET = exports.LAST_OFFSET = exports.SYMBOL_OFFSET = exports.TIMESTAMP_OFFSET = exports.TYPEID = undefined;
 
 var _QitchConstants = require("../QitchConstants");
 
@@ -11199,7 +11528,9 @@ var DECIMALPREMARKETVOLUME_OFFSET = exports.DECIMALPREMARKETVOLUME_OFFSET = DECI
 var DECIMALPOSTMARKETVOLUME_OFFSET = exports.DECIMALPOSTMARKETVOLUME_OFFSET = DECIMALPREMARKETVOLUME_OFFSET + _QitchConstants.DOUBLE_LENGTH;
 var DECIMALLASTTRADESIZE_OFFSET = exports.DECIMALLASTTRADESIZE_OFFSET = DECIMALPOSTMARKETVOLUME_OFFSET + _QitchConstants.DOUBLE_LENGTH;
 
-var LENGTH = exports.LENGTH = DECIMALLASTTRADESIZE_OFFSET + _QitchConstants.DOUBLE_LENGTH;
+var CURRENCYID_OFFSET = exports.CURRENCYID_OFFSET = DECIMALLASTTRADESIZE_OFFSET + _QitchConstants.DOUBLE_LENGTH;
+
+var LENGTH = exports.LENGTH = CURRENCYID_OFFSET + _QitchConstants.CURRENCYID_LENGTH;
 
 var PricedataFlags = exports.PricedataFlags = function () {
     function PricedataFlags() {
@@ -11415,6 +11746,10 @@ var TradeFlags = exports.TradeFlags = function () {
         return bits & TradeFlags.prototype.CORRECTION_MASK;
     };
 
+    TradeFlags.isOutOfSequence = function isOutOfSequence(bits) {
+        return bits & TradeFlags.prototype.OUTOFSEQUENCE_MASK;
+    };
+
     return TradeFlags;
 }();
 
@@ -11436,6 +11771,7 @@ TradeFlags.prototype.BLOCKTRADE_MASK = 0x00008000;
 TradeFlags.prototype.IGNOREOPEN_MASK = 0x00000100;
 TradeFlags.prototype.TRADETHROUGHEXEMPT = 0x00000200;
 TradeFlags.prototype.CORRECTION_MASK = 0x08000000;
+TradeFlags.prototype.OUTOFSEQUENCE_MASK = 0x00000400;
 }).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer,arguments[3],arguments[4],arguments[5],arguments[6],require("timers").setImmediate,require("timers").clearImmediate,"/lib/qitch/marketDataDefinition/TradeDef.js","/lib/qitch/marketDataDefinition")
 },{"../QitchConstants":26,"_process":119,"buffer":109,"timers":140}],87:[function(require,module,exports){
 (function (process,global,Buffer,__argument0,__argument1,__argument2,__argument3,setImmediate,clearImmediate,__filename,__dirname){
@@ -12192,6 +12528,10 @@ var _streamerEvents = require("../streamer-events.js");
 
 var events = _interopRequireWildcard(_streamerEvents);
 
+var _http = require("../http.js");
+
+var _http2 = _interopRequireDefault(_http);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -12200,12 +12540,23 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var StompConnection = function () {
     function StompConnection(createTransmitter, openSocket, log) {
+        var maxReconnectAttempts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 3;
+        var pingUrl = arguments[4];
+
         _classCallCheck(this, StompConnection);
 
         this.openSocket = openSocket;
         this.createTransmitter = createTransmitter;
         this.log = (0, _logging.asLogger)(log);
         this.events = new _EventSupport2["default"](this);
+        this.currentConn = '';
+        //Max number of times that the client will try to reopen per loop
+        this.maxReconnectAttempts = maxReconnectAttempts;
+        //Max number of times client will be able to try to reopen in total. Once this is reached, client will close and no reconnect will be attempted.
+        //probably means that an unhandled loop was reached
+        this.maxReconnectsTotal = 3;
+        this.isFirstConnection = true;
+        this.pingUrl = pingUrl;
     }
 
     StompConnection.prototype.open = function open() {
@@ -12217,21 +12568,70 @@ var StompConnection = function () {
             }
         };
 
-        this.transmitter = this.createTransmitter(socketProxy);
+        //Check to avoid creating unnecessary events and objects
+        if (this.isFirstConnection) {
+            this.on("reopen", function (e) {
+                var prevConn = _this.currentConn;
+                _this.currentConn = e.connectionId;
+                _this.events.fire("reconnect", events.event("Reconnection success", {
+                    previousConnectionId: prevConn,
+                    currentConnectionId: _this.currentConn
+                }));
+            });
 
-        this.transmitter.on("message", function (message) {
-            _this.events.fire("message", message);
-        });
+            this.transmitter = this.createTransmitter(socketProxy);
+            this.transmitter.on("message", function (message) {
+                _this.events.fire("message", message);
+            });
+        }
 
         this.socket = this.openSocket(function (request) {
             _this.request = request;
+            _this.reconnect = false;
             return {
+                onOpen: function onOpen(response) {
+                    if (response.command === "CONNECTED") {
+                        _this.isConnectionUp = true;
+                        var e = events.event("open", {
+                            connectionId: response.headers['user-name']
+                        });
+                        _this.log.info(e);
+                        _this.events.fire("open", e);
+                        if (!_this.isFirstConnection) {
+                            _this.maxReconnectsTotal--;
+                            _this.events.fire("reopen", e);
+                        }
+                        _this.currentConn = response.headers['user-name'];
+                    }
+                },
+                onError: function onError(response) {
+                    _this.isConnectionUp = false;
+                    _this.isServerUp(function (err, result) {
+                        if (err !== null) {
+                            _this.reconnect = false;
+                            _this.log.warn("Connection lost, Streamer Server isn't Up");
+                        } else {
+                            _this.reconnect = true;
+                            _this.log.warn('Connection lost, Streamer Server is Up');
+                        }
+                    });
+                },
+                onClose: function onClose() {
+                    _this.isConnectionUp = false;
+                },
                 onMessage: function onMessage(response) {
+                    var responseBody = JSON.parse(response.body);
+                    if (responseBody.code !== undefined) {
+                        if (responseBody.code == 401 || responseBody.code == 403) {
+                            _this.log.info("Unable to reconnect with code: " + responseBody.code + ", reason: " + responseBody.reason);
+                            _this.reconnect = false;
+                            _this.isConnectionUp = false;
+                        }
+                    }
                     _this.transmitter.onMessage(response.body);
                 }
-
             };
-        });
+        }, this.currentConn);
     };
 
     StompConnection.prototype.close = function close() {
@@ -12239,6 +12639,9 @@ var StompConnection = function () {
             try {
                 this.socket.close();
                 this.socket = null;
+                if (this.reconnect) {
+                    this.tryReopen();
+                }
             } catch (err) {
                 this.events.fire("error", events.error("Error closing", {
                     reason: err.message,
@@ -12249,6 +12652,44 @@ var StompConnection = function () {
         }
     };
 
+    StompConnection.prototype.tryReopen = function tryReopen() {
+        var _this2 = this;
+
+        if (this.isConnectionUp || this.maxReconnectsTotal <= 0) {
+            this.log.error("Connection is already open or max reconnects was reached, won't try to reconnect");
+            return;
+        }
+        this.isFirstConnection = false;
+        var currentAttempts = this.maxReconnectAttempts;
+        var reconnect = function reconnect() {
+            if (currentAttempts <= 0) {
+                _this2.reconnect = false;
+                _this2.log.error("Error while reconnecting. No attempts left.");
+                //if maxattempts was reached and no connection was open, exit.
+                _this2.maxReconnectAttempts = 0;
+                return;
+            }
+            if (_this2.isConnectionUp || !_this2.reconnect) {
+                return;
+            }
+            _this2.log.info("Attempting reconnect. Attempts left: " + currentAttempts);
+            _this2.reopen(currentAttempts);
+            currentAttempts--;
+
+            setTimeout(reconnect, 500);
+        };
+        setTimeout(reconnect, 500);
+    };
+
+    StompConnection.prototype.reopen = function reopen(attempt) {
+        try {
+            this.open();
+        } catch (exception) {
+            this.log.warn("There was an error while reopening attempt #" + attempt);
+            this.events.fire("error", exception);
+        }
+    };
+
     StompConnection.prototype.send = function send(message) {
         try {
             this.transmitter.send(message);
@@ -12261,6 +12702,14 @@ var StompConnection = function () {
         }
     };
 
+    StompConnection.prototype.isReconnect = function isReconnect() {
+        return this.request['x-Stream-isReconnect'];
+    };
+
+    StompConnection.prototype.setReconnect = function setReconnect(doReconnect) {
+        this.reconnect = doReconnect;
+    };
+
     StompConnection.prototype.setServer = function setServer(server) {
         this.request['X-Stream-Instance'] = server;
     };
@@ -12269,6 +12718,21 @@ var StompConnection = function () {
         return this.socket == null;
     };
 
+    StompConnection.prototype.isServerUp = function isServerUp(callback) {
+        (0, _http2["default"])({
+            url: this.pingUrl,
+            success: function success(result) {
+                return callback(null, result);
+            },
+            type: "GET",
+            failure: callback
+        });
+    };
+
+    StompConnection.prototype.setConnectionUp = function setConnectionUp(isConnectionUp) {
+        this.isConnectionUp = isConnectionUp;
+    };
+
     StompConnection.prototype.on = function on(event, callback) {
         return this.events.on(event, callback);
     };
@@ -12278,7 +12742,7 @@ var StompConnection = function () {
 
 exports["default"] = StompConnection;
 }).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer,arguments[3],arguments[4],arguments[5],arguments[6],require("timers").setImmediate,require("timers").clearImmediate,"/lib/stomp/StompConnection.js","/lib/stomp")
-},{"../EventSupport.js":2,"../logging.js":16,"../streamer-events.js":97,"_process":119,"buffer":109,"timers":140}],94:[function(require,module,exports){
+},{"../EventSupport.js":2,"../http.js":14,"../logging.js":16,"../streamer-events.js":97,"_process":119,"buffer":109,"timers":140}],94:[function(require,module,exports){
 (function (process,global,Buffer,__argument0,__argument1,__argument2,__argument3,setImmediate,clearImmediate,__filename,__dirname){
 "use strict";
 
@@ -12339,6 +12803,8 @@ var StompStream = function () {
                 _this.pendingConnection(err);
             }
             _this.events.fire("error", err);
+        }).on("reconnect", function (msg) {
+            _this.reconnectSuccess(msg);
         });
 
         this.requestid = new _UShortId2["default"]();
@@ -12351,6 +12817,7 @@ var StompStream = function () {
         this.pendingNewsUnsubscriptions = {};
         this.pendingAlertSubscription = {};
         this.pendingTradeSubscription = {};
+        this.pendingTradeUnsubscription = {};
 
         this.on("error", function (err) {
             _this.log.warn(err);
@@ -12368,6 +12835,11 @@ var StompStream = function () {
         }
     };
 
+    StompStream.prototype.reconnectSuccess = function reconnectSuccess(msg) {
+        this.events.fire("reconnectSuccess", msg);
+        this.log.info("Successfull reconnection. Previous Id: " + msg.previousConnectionId + " Current Id = " + msg.currentConnectionId);
+    };
+
     StompStream.prototype.on = function on(event, listener) {
         return this.events.on(event, listener);
     };
@@ -12548,7 +13020,7 @@ var StompStream = function () {
         this.send(request);
     };
 
-    StompStream.prototype.subscribeTrade = function subscribeTrade(operation, optsOrCallback, callbackOrNothing) {
+    StompStream.prototype.subscribeTrade = function subscribeTrade(notificationType, optsOrCallback, callbackOrNothing) {
         var opts = optsOrCallback && typeof optsOrCallback !== "function" ? optsOrCallback : null;
         var callback = callbackOrNothing ? callbackOrNothing : optsOrCallback && typeof optsOrCallback === "function" ? optsOrCallback : null;
 
@@ -12566,11 +13038,11 @@ var StompStream = function () {
             mimetype: this.format,
             callback: callback,
             result: {
-                operation: ""
+                notificationType: ""
             }
         };
 
-        var request = this.buildTradeSubscribeRequest(operation, tradeSub);
+        var request = this.buildTradeSubscribeRequest(notificationType, tradeSub, _streamerApi.messages.control.Action.SUBSCRIBE);
         var id = this.requestid.next();
         tradeSub.id.push(id);
         this.pendingTradeSubscription[id] = tradeSub;
@@ -12784,6 +13256,37 @@ var StompStream = function () {
         this.send(request);
     };
 
+    StompStream.prototype.unsubscribeTrade = function unsubscribeTrade(notificationType, optsOrCallback, callbackOrNothing) {
+        var opts = optsOrCallback && typeof optsOrCallback !== "function" ? optsOrCallback : null;
+        var callback = callbackOrNothing ? callbackOrNothing : optsOrCallback && typeof optsOrCallback === "function" ? optsOrCallback : null;
+
+        if (this.isClosed()) {
+            var event = events.error("Stream is disconnected", {
+                code: -1,
+                reason: "Already disconnected"
+            });
+            this.events.fire("error", event);
+            return;
+        }
+
+        var tradeSub = {
+            id: [],
+            mimetype: this.format,
+            callback: callback,
+            result: {
+                notificationType: ""
+            }
+        };
+
+        var request = this.buildTradeSubscribeRequest(notificationType, tradeSub, _streamerApi.messages.control.Action.UNSUBSCRIBE);
+        var id = this.requestid.next();
+        tradeSub.id.push(id);
+        this.pendingTradeUnsubscription[id] = tradeSub;
+        request.id = id;
+
+        this.send(request);
+    };
+
     StompStream.prototype._handlejsonmsg = function _handlejsonmsg(msg) {
         if ((0, _streamerUtils.iscontrolmessage)(msg)) {
             this.handlectrlmsg(msg);
@@ -12864,9 +13367,10 @@ var StompStream = function () {
         return msg;
     };
 
-    StompStream.prototype.buildTradeSubscribeRequest = function buildTradeSubscribeRequest(operation, sub) {
+    StompStream.prototype.buildTradeSubscribeRequest = function buildTradeSubscribeRequest(notificationType, sub, action) {
         var msg = new _streamerApi.messages.control.TradeSubscribeMessage();
-        msg.operation = operation;
+        msg.action = action;
+        msg.notificationType = notificationType;
         msg.mimetype = sub.mimetype;
         return msg;
     };
@@ -12925,6 +13429,9 @@ var StompStream = function () {
             case _streamerApi.messages.MessageTypeNames.ctrl.NEWS_CMD_FILTER_RESPONSE:
                 this.onNewsCmdFilterResponse(msg);
                 break;
+            case _streamerApi.messages.MessageTypeNames.ctrl.TRADE_UNSUBSCRIBE_RESPONSE:
+                this.onTradeUnsubscribeResponse(msg);
+                break;
             case _streamerApi.messages.MessageTypeNames.ctrl.CONNECT_RESPONSE:
                 this.onConnectResponse(msg);
                 break;
@@ -12946,6 +13453,12 @@ var StompStream = function () {
             case _streamerApi.messages.MessageTypeNames.ctrl.OPEN_FLOW:
                 this.onOpenFlow(msg);
                 break;
+            case _streamerApi.messages.MessageTypeNames.ctrl.RECONNECT_RESPONSE:
+                this.onReconnectMessage(msg);
+                break;
+            case _streamerApi.messages.MessageTypeNames.ctrl.MISSED_DATA_SENT:
+                this.onMissedDataSent(msg);
+                break;
         }
     };
 
@@ -13218,9 +13731,9 @@ var StompStream = function () {
 
         var result = tradeSub.result;
 
-        if (msg.operation) {
-            this.log.debug('Trade ' + msg.operation);
-            result.operation = msg.operation;
+        if (msg.notificationType) {
+            this.log.debug('Trade ' + msg.notificationType);
+            result.notificationType = msg.notificationType;
         }
 
         if (tradeSub.id.length === 0) {
@@ -13279,6 +13792,41 @@ var StompStream = function () {
         }
     };
 
+    StompStream.prototype.onTradeUnsubscribeResponse = function onTradeUnsubscribeResponse(msg) {
+        var tradeSub = this.pendingTradeUnsubscription[msg.__id];
+        var callback = tradeSub.callback;
+
+        (0, _utils.removeFromArray)(tradeSub.id, msg.__id);
+        delete this.pendingTradeUnsubscription[msg.__id];
+
+        console.log(msg);
+        if (msg.code != 200 && !tradeSub.failed) {
+            tradeSub.failed = true;
+            var event = events.error("Error unsubscribing", {
+                code: msg.code,
+                reason: msg.reason
+            });
+            this.events.fire("error", event);
+            if (callback) {
+                tradeSub.callback(event);
+            }
+            return;
+        }
+
+        var result = tradeSub.result;
+
+        if (msg.notificationType) {
+            this.log.debug('Trade ' + msg.notificationType);
+            result.notificationType = msg.notificationType;
+        }
+
+        if (tradeSub.id.length === 0) {
+            if (callback) {
+                callback(null, tradeSub.result);
+            }
+        }
+    };
+
     StompStream.prototype.onNewsCmdFilterRefreshResponse = function onNewsCmdFilterRefreshResponse(msg) {
         console.log("msg", msg);
         if (msg.code != 200) {
@@ -13370,8 +13918,18 @@ var StompStream = function () {
         }
     };
 
+    StompStream.prototype.onReconnectMessage = function onReconnectMessage(msg) {
+        if (msg.code === 450) {
+            this.events.fire("slow", "Reconnection recieved a slow code: " + msg.code);
+            this._isSlowConnection = true;
+            this.conn.setReconnect = false;
+        }
+        this.events.fire("reconnectMessage", msg);
+        console.log(msg);
+    };
+
     StompStream.prototype.onConnectResponse = function onConnectResponse(msg) {
-        if (msg.code != 200) {
+        if (msg.code !== 200) {
             var event = events.error("Connection failed", {
                 code: msg.code,
                 reason: msg.reason
@@ -13438,6 +13996,11 @@ var StompStream = function () {
         this.events.fire("resubscribeMessage", msg);
     };
 
+    StompStream.prototype.onMissedDataSent = function onMissedDataSent(msg) {
+        this.log.debug(_formatting.msgfmt.fmt(msg));
+        this.events.fire("missedDataSent", msg);
+    };
+
     StompStream.prototype.onOpenFlow = function onOpenFlow(msg) {
         this.conn.send(msg);
     };
@@ -13456,8 +14019,29 @@ var StompStream = function () {
         if (!this.isClosed()) {
             var conn = this.conn;
             this.conn = null;
-            this.events.fire("close", msg);
             conn.close();
+            this.events.fire("close", msg);
+            if (conn.isReconnect()) {
+                //Will need to reset the events since they duplicate each time it reconnects.
+                this.events = new _EventSupport2["default"]();
+                this.conn = conn;
+            }
+        }
+    };
+
+    StompStream.prototype.performReconnect = function performReconnect(callback) {
+        if (this.conn != null && this.conn.isReconnect()) {
+            if (this.conn.isConnectionUp) {
+                this.log.warn("Connection is not closed and won't try reconnect.");
+                return;
+            }
+            this.conn.setReconnect(true);
+            this.conn.tryReopen();
+            if (callback) {
+                callback();
+            }
+        } else {
+            this.log.warn("Reconnect flag is set to false");
         }
     };
 
@@ -13516,6 +14100,8 @@ var STREAMURLS = {
     "streamStomp": "/stream/connect"
 };
 
+var HEADERPARAMS = '';
+
 var StompStreamingService = function () {
     function StompStreamingService(http, stompJs, log, config) {
         var _this = this;
@@ -13526,6 +14112,7 @@ var StompStreamingService = function () {
         this.stompJs = stompJs;
         this.log = (0, _logging.asLogger)(log);
         this.config = config || {};
+        this.maxReconnectAttempts = this.config.maxReconnectAttempts;
 
         this.format = this.config.format;
         if (this.config.format === 'application/json') {
@@ -13535,33 +14122,65 @@ var StompStreamingService = function () {
         }
     }
 
-    StompStreamingService.prototype.openStompSocket = function openStompSocket(handlers) {
+    StompStreamingService.prototype.openStompSocket = function openStompSocket(handlers, connectionId) {
+        HEADERPARAMS = '';
         var headers = {
             'X-Stream-Version': _streamerApi.VERSION,
             'X-Stream-Lib': _streamerApi.LIBRARY_NAME
         };
+        this.addToHeaderParams('X-Stream-Version', _streamerApi.VERSION);
+        this.addToHeaderParams('X-Stream-Lib', _streamerApi.LIBRARY_NAME);
 
         var _conflation = this.config.conflation;
         if (_conflation != null && _conflation !== '') {
             headers['X-Stream-Conflation'] = _conflation;
+            this.addToHeaderParams('X-Stream-Conflation', _conflation);
+        }
+
+        if (connectionId != null && connectionId !== '') {
+            headers['X-Stream-Previous-Connection-Id'] = connectionId;
+            this.addToHeaderParams('X-Stream-Previous-Connection-Id', connectionId);
         }
 
         var _rejectExcessiveConnection = this.config.rejectExcessiveConnection;
         if (_rejectExcessiveConnection != null && _rejectExcessiveConnection !== '') {
             headers['X-Stream-Reject'] = _rejectExcessiveConnection;
+            this.addToHeaderParams('X-Stream-Reject', _rejectExcessiveConnection);
         }
 
         if (this.config.format === 'application/json' || this.config.format === _message.MimeTypes.QITCH) {
             headers['X-Stream-Format'] = this.format;
+            this.addToHeaderParams('X-Stream-Format', this.format);
         }
 
         if (this.config.updatesOnly === 'true') {
             headers['X-Stream-UpdatesOnly'] = true;
+            this.addToHeaderParams('X-Stream-UpdatesOnly', true);
+        }
+
+        var _isReconnect = this.config.isReconnect;
+        if (_isReconnect != null && _isReconnect !== '') {
+            headers['x-Stream-isReconnect'] = _isReconnect;
+            this.addToHeaderParams('x-Stream-isReconnect', _isReconnect);
+        }
+
+        var _alwaysReconnect = this.config.alwaysReconnect;
+        if (_alwaysReconnect != null && _alwaysReconnect !== '') {
+            headers['x-Stream-isAlwaysReopen'] = _alwaysReconnect;
+            this.addToHeaderParams('x-Stream-isAlwaysReopen', _alwaysReconnect);
+        }
+
+        if (this.config.isMissedData === 'ALL') {
+            headers['X-Stream-isReceiveAllMissedData'] = true;
+            this.addToHeaderParams('X-Stream-isReceiveAllMissedData', true);
+        } else if (this.config.isMissedData === 'LATEST') {
+            headers['X-Stream-isReceiveLatestMissedData'] = true;
+            this.addToHeaderParams('X-Stream-isReceiveLatestMissedData', true);
         }
 
         Object.assign(headers, this.config.credentials.getHeaders());
 
-        var url = this.config.url + STREAMURLS.streamStomp;
+        var url = this.config.url + STREAMURLS.streamStomp + HEADERPARAMS;
         var stompClient = this.stompJs.Stomp.client(url);
 
         var authMessage = new _streamerApi.messages.control.AuthenticationMessage();
@@ -13570,6 +14189,7 @@ var StompStreamingService = function () {
             authMessage.authorization = this.config.credentials.sid;
         } else if (this.config.credentials.wmid !== undefined && this.config.credentials.token !== undefined) {
             authMessage.authenticationMethod = "enterprise";
+            authMessage.wmid = this.config.credentials.wmid;
             authMessage.authorization = this.config.credentials.token;
         } else if (this.config.credentials.wmid !== undefined) {
             authMessage.authenticationMethod = "wmid";
@@ -13587,20 +14207,25 @@ var StompStreamingService = function () {
             authMessage.rejectExcessiveConnection = this.config.rejectExcessiveConnection;
         }
 
-        stompClient.connect({}, function (frame) {
+        stompClient.connect(headers, function (frame) {
             stompClient.subscribe('/user/queue/messages', function (responseMessage) {
                 handlers(headers).onMessage(responseMessage);
             });
 
-            stompClient.send("/stream/subscribe", headers, JSON.stringify(authMessage));
+            handlers(headers).onOpen(frame);
+            stompClient.send("/stream/message", headers, JSON.stringify(authMessage));
+        }, function (frame) {
+            handlers(headers).onError(frame);
         });
 
         return {
             send: function send(msg) {
-                stompClient.send("/stream/subscribe", headers, msg);
+                stompClient.send("/stream/message", headers, msg);
             },
             close: function close() {
-                stompClient.disconnect();
+                stompClient.disconnect(function () {
+                    handlers(headers).onClose();
+                });
             }
         };
     };
@@ -13610,9 +14235,9 @@ var StompStreamingService = function () {
 
         return new _StompConnection2["default"](function (socket) {
             return _this2.createTransmitter(socket);
-        }, function (handlers) {
-            return _this2.openStompSocket(handlers);
-        }, this.logger);
+        }, function (handlers, connectionId) {
+            return _this2.openStompSocket(handlers, connectionId);
+        }, this.log, this.maxReconnectAttempts, this.config.host + STREAMURLS.ping);
     };
 
     StompStreamingService.prototype.openStompStream = function openStompStream(callback) {
@@ -13642,6 +14267,14 @@ var StompStreamingService = function () {
         });
     };
 
+    StompStreamingService.prototype.addToHeaderParams = function addToHeaderParams(header, val) {
+        if (HEADERPARAMS === '') {
+            HEADERPARAMS = HEADERPARAMS + '?' + header + '=' + val;
+        } else {
+            HEADERPARAMS = HEADERPARAMS + '&' + header + '=' + val;
+        }
+    };
+
     return StompStreamingService;
 }();
 
@@ -13660,7 +14293,7 @@ exports.__esModule = true;
  */
 
 var LIBRARY_NAME = exports.LIBRARY_NAME = "JavaScript";
-var VERSION = exports.VERSION = "2.27.0";
+var VERSION = exports.VERSION = "2.33.0";
 
 /**
  * Streamer message api namespace.
@@ -13724,7 +14357,10 @@ messages.MessageTypeNames = {
         NEWS_CMD_FILTER_REFRESH_RESPONSE: 'C25',
         NEWS_CMD_FILTER_RESPONSE: 'C26',
         AUTHENTICATION: 'C27',
-        OPEN_FLOW: 'C28'
+        OPEN_FLOW: 'C28',
+        RECONNECT_RESPONSE: 'C29',
+        TRADE_UNSUBSCRIBE_RESPONSE: 'C30',
+        MISSED_DATA_SENT: 'C31'
     },
     /**
      * Name space for data message type identifiers.<br>
@@ -13752,7 +14388,8 @@ messages.MessageTypeNames = {
         NEWS: 'D18',
         TRADENOTIFICATION: 'D19',
         NEWSCMDFILTER: 'D20',
-        NEWSERROR: 'D21'
+        NEWSERROR: 'D21',
+        DIVIDEND: 'D22'
     }
 };
 
@@ -13960,11 +14597,18 @@ messages.control.AlertsSubUnsubMessage.prototype = new messages.control.CtrlMess
 messages.control.TradeSubscribeMessage = function () {
     this.init(messages.MessageTypeNames.ctrl.TRADE_SUBSCRIBE);
 
+    /**
+     * The action the server will taken when receiving this message.
+     * @type {string}
+     * @see exports.messages.control.Action
+     */
+    this.action = null;
+
     /**
      * The subscribe/un-subscribe for trade notifications.
      * @type {Array.<string>}
      */
-    this.operation = null;
+    this.notificationType = null;
 
     /**
      * Requested message mime-type format.
@@ -14083,6 +14727,15 @@ messages.control.NewsUnsubscribeResponse = function () {
 };
 messages.control.NewsUnsubscribeResponse.prototype = new messages.control.BaseResponse();
 
+/**
+ * Creates Trade notification subscribe response message.
+ * @constructor
+ */
+messages.control.TradeUnsubscribeResponse = function () {
+    this.init(messages.MessageTypeNames.ctrl.TRADE_UNSUBSCRIBE_RESPONSE);
+};
+
+messages.control.TradeUnsubscribeResponse.prototype = new messages.control.BaseResponse();
 /**
  * Creates a stream entitlement info.
  * @constructor
@@ -14142,6 +14795,44 @@ messages.control.ConnectResponse = function () {
 };
 messages.control.ConnectResponse.prototype = new messages.control.BaseResponse();
 
+/**
+ * Creates a new reconnect response message
+ * @constructor
+ */
+messages.control.ReconnectResponse = function () {
+    undefined.init(messages.MessageTypeNames.ctrl.RECONNECT_RESPONSE);
+
+    /**
+    * The server version.
+    * @type {string}
+    */
+    undefined.version = null;
+
+    /**
+     * The flow control check interval.
+     * @type {number}
+     */
+    undefined.flowControlCheckInterval = null;
+
+    /**
+     * The server instance connected to.
+     * @type {string}
+     */
+    undefined.serverInstance = null;
+
+    /**
+     * The conflation rate in milliseconds.
+     * @type {number}
+     */
+    undefined.conflationMs = null;
+
+    /**
+    * The previous subscriptions
+    * @type {Array.<messages.control.StreamEntitlement>}
+    */
+    undefined.previousSubscriptions = null;
+};
+
 /**
  * Creates a connection response message.
  * @constructor
@@ -14215,6 +14906,12 @@ messages.control.AuthenticationMessage = function () {
      */
     this.authenticationMethod = null;
 
+    /**
+     * Auth WMID if using enterprise token auth method we need to have both wmid and authorization.
+     * @type {String}
+     */
+    this.wmid = null;
+
     /**
      * Auth token.
      * @type {String}
@@ -14317,6 +15014,22 @@ messages.control.ResubscribeMessage = function () {
 };
 messages.control.ResubscribeMessage.prototype = new messages.control.CtrlMessage();
 
+/**
+* Creates a Missed Data Sent response message.
+* @constructor
+*/
+messages.control.MissedDataSent = function () {
+    this.init(messages.MessageTypeNames.ctrl.MISSED_DATA_SENT);
+
+    /**
+     * The timestamp of message creation.
+     * @type {number|JSBI} for connections with JSON format timestamp will be decoded as number,
+     * for connections with QITCH format - {@link JSBI.BigInt}
+     */
+    this.timestamp = null;
+};
+messages.control.MissedDataSent.prototype = new messages.control.CtrlMessage();
+
 /**
  * Stream entitlement types.
  * @enum