npm - @resolveio/server-lib - Versions diffs - 5.1.1 → 5.1.2 - Mend

@resolveio/server-lib 5.1.1 → 5.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/server-app.js +41 -30

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "",
   "main": "index.ts",
   "scripts": {

package/server-app.js CHANGED Viewed

@@ -281,46 +281,57 @@ var ResolveIOMainServer = /** @class */ (function () {
             }, 10000);
             // On data received (message)
             ws.on('message', function (message) { return __awaiter(_this, void 0, void 0, function () {
-                var _a, _b, socketData, data, messageDate, messageId, type, subType, pub;
+                var _a, _b, parseErrorFound, socketData, data, messageDate, messageId, type, subType, pub;
                 var _this = this;
                 return __generator(this, function (_c) {
                     if (this.LOGGER === 'DEBUG') {
                         console.log('Message from: ' + ws['user'], message);
                     }
-                    socketData = JSON.parse(message, common_1.dateReviver);
-                    data = common_2.deepCopy(socketData);
-                    if (data[0] === 'ping') {
-                        if (ws && ws.readyState === ws.OPEN) {
-                            ws.send('pong', function (error) {
-                                if (error) {
-                                    console.log('Error on WS: ', error);
-                                    _this.unsubscribeWS(ws);
-                                }
-                            });
-                        }
-                        return [2 /*return*/];
+                    parseErrorFound = false;
+                    socketData = null;
+                    try {
+                        socketData = JSON.parse(message, common_1.dateReviver);
                     }
-                    messageDate = data.shift();
-                    messageId = data.shift();
-                    type = data.shift();
-                    if (type === 'subscription') {
-                        subType = data.shift();
-                        pub = data.shift();
-                        // Subscribe
-                        if (subType === 'sub') {
-                            (_a = this._subscriptionManager).subscribe.apply(_a, [messageDate, ws, messageId, pub].concat(data));
+                    catch (e) {
+                        console.log('Error - JSON.parse', message);
+                        this._methodManager.sendEmail('dev@resolveio.com', 'SERVER - JSON Parse Error - ' + this._serverConfig['CLIENT_NAME'], JSON.stringify([message, e]));
+                        parseErrorFound = true;
+                    }
+                    if (!parseErrorFound) {
+                        data = common_2.deepCopy(socketData);
+                        if (data[0] === 'ping') {
+                            if (ws && ws.readyState === ws.OPEN) {
+                                ws.send('pong', function (error) {
+                                    if (error) {
+                                        console.log('Error on WS: ', error);
+                                        _this.unsubscribeWS(ws);
+                                    }
+                                });
+                            }
+                            return [2 /*return*/];
+                        }
+                        messageDate = data.shift();
+                        messageId = data.shift();
+                        type = data.shift();
+                        if (type === 'subscription') {
+                            subType = data.shift();
+                            pub = data.shift();
+                            // Subscribe
+                            if (subType === 'sub') {
+                                (_a = this._subscriptionManager).subscribe.apply(_a, [messageDate, ws, messageId, pub].concat(data));
+                            }
+                            // Unsubscribe
+                            else {
+                                (_b = this._subscriptionManager).unsubscribe.apply(_b, [messageDate, ws, messageId, pub].concat(data));
+                            }
                         }
-                        // Unsubscribe
                         else {
-                            (_b = this._subscriptionManager).unsubscribe.apply(_b, [messageDate, ws, messageId, pub].concat(data));
+                            this._msgQueue.splice(0, 0, {
+                                ws: ws,
+                                data: socketData
+                            });
                         }
                     }
-                    else {
-                        this._msgQueue.splice(0, 0, {
-                            ws: ws,
-                            data: socketData
-                        });
-                    }
                     return [2 /*return*/];
                 });
             }); });