Merge branch 'master' into james-server-stats

1 files changed, 11 insertions, 12 deletions

diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index a11d20cfa..2acdaa5a3 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -51,7 +51,7 @@ export namespace WebSocket {
                 next();
             });
 
-            socket.emit(MessageStore.UpdateStats.Message, DashStats.getUpdatedStatsBundle())
+            socket.emit(MessageStore.UpdateStats.Message, DashStats.getUpdatedStatsBundle());
 
             // convenience function to log server messages on the client
             function log(message?: any, ...optionalParams: any[]) {
@@ -104,14 +104,12 @@ export namespace WebSocket {
             socket.on('disconnect', function () {
                 let currentUser = socketMap.get(socket);
                 if (!(currentUser === undefined)) {
-                    let currentUsername = currentUser.split(' ')[0]
+                    let currentUsername = currentUser.split(' ')[0];
                     DashStats.logUserLogout(currentUsername, socket);
-                    delete timeMap[currentUsername]
+                    delete timeMap[currentUsername];
                 }
             });
 
-
-
             Utils.Emit(socket, MessageStore.Foo, 'handshooken');
 
             Utils.AddServerHandler(socket, MessageStore.Bar, guid => barReceived(socket, guid));
@@ -146,10 +144,10 @@ export namespace WebSocket {
             };
         });
 
-        setInterval(function() {
+        setInterval(function () {
             // Utils.Emit(socket, MessageStore.UpdateStats, DashStats.getUpdatedStatsBundle());
 
-            io.emit(MessageStore.UpdateStats.Message, DashStats.getUpdatedStatsBundle())
+            io.emit(MessageStore.UpdateStats.Message, DashStats.getUpdatedStatsBundle());
         }, DashStats.SAMPLING_INTERVAL);
     }
 
@@ -193,7 +191,7 @@ export namespace WebSocket {
     }
 
     function barReceived(socket: SocketIO.Socket, userEmail: string) {
-         clients[userEmail] = new Client(userEmail.toString());
+        clients[userEmail] = new Client(userEmail.toString());
         const currentdate = new Date();
         const datetime = currentdate.getDate() + '/' + (currentdate.getMonth() + 1) + '/' + currentdate.getFullYear() + ' @ ' + currentdate.getHours() + ':' + currentdate.getMinutes() + ':' + currentdate.getSeconds();
         console.log(blue(`user ${userEmail} has connected to the web socket at: ${datetime}`));
@@ -326,8 +324,7 @@ export namespace WebSocket {
         const remListItems = diff.diff.$set[updatefield].fields;
         const curList = (curListItems as any)?.fields?.[updatefield.replace('fields.', '')]?.fields.filter((f: any) => f !== null) || [];
         diff.diff.$set[updatefield].fields = curList?.filter(
-            (curItem: any) => !remListItems.some((remItem: any) => (remItem.fieldId ? remItem.fieldId === curItem.fieldId :
-                 remItem.heading ? remItem.heading === curItem.heading : remItem === curItem))
+            (curItem: any) => !remListItems.some((remItem: any) => (remItem.fieldId ? remItem.fieldId === curItem.fieldId : remItem.heading ? remItem.heading === curItem.heading : remItem === curItem))
         );
         const sendBack = diff.diff.length !== diff.diff.$set[updatefield].fields.length;
         delete diff.diff.length;
@@ -373,9 +370,11 @@ export namespace WebSocket {
     var CurUser: string | undefined = undefined;
 
     function UpdateField(socket: Socket, diff: Diff) {
-        let currentUsername = socketMap.get(socket)!.split(' ')[0];
+        const curUser = socketMap.get(socket);
+        if (!curUser) return;
+        let currentUsername = curUser.split(' ')[0];
         userOperations.set(currentUsername, userOperations.get(currentUsername) !== undefined ? userOperations.get(currentUsername)! + 1 : 0);
-        
+
         if (CurUser !== socketMap.get(socket)) {
             CurUser = socketMap.get(socket);
             console.log('Switch User: ' + CurUser);