1 files changed, 13 insertions, 10 deletions

diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 54944e944..5d1390d37 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -1,4 +1,4 @@
-import { blue, magenta, yellow } from 'colors';
+import { blue } from 'colors';
 import * as express from 'express';
 import { createServer, Server } from 'https';
 import { networkInterfaces } from 'os';
@@ -22,7 +22,6 @@ import { resolvedPorts } from './server_Initialization';
 export namespace WebSocket {
     export let _socket: Socket;
     export const clients: { [key: string]: Client } = {};
-    // export const clients = new Map<string, Client>();
     export const socketMap = new Map<SocketIO.Socket, string>();
     export const userOperations = new Map<string, number>();
     export let disconnect: Function;
@@ -52,6 +51,8 @@ export namespace WebSocket {
                 next();
             });
 
+            socket.emit(MessageStore.UpdateStats.Message, DashStats.getUpdatedStatsBundle())
+
             // convenience function to log server messages on the client
             function log(message?: any, ...optionalParams: any[]) {
                 socket.emit('log', ['Message from server:', message, ...optionalParams]);
@@ -109,6 +110,8 @@ export namespace WebSocket {
                 }
             });
 
+
+
             Utils.Emit(socket, MessageStore.Foo, 'handshooken');
 
             Utils.AddServerHandler(socket, MessageStore.Bar, guid => barReceived(socket, guid));
@@ -142,6 +145,12 @@ export namespace WebSocket {
                 socket.disconnect(true);
             };
         });
+
+        setInterval(function() {
+            // Utils.Emit(socket, MessageStore.UpdateStats, DashStats.getUpdatedStatsBundle());
+
+            io.emit(MessageStore.UpdateStats.Message, DashStats.getUpdatedStatsBundle())
+        }, DashStats.SAMPLING_INTERVAL);
     }
 
     function processGesturePoints(socket: Socket, content: GestureContent) {
@@ -185,13 +194,9 @@ export namespace WebSocket {
 
     function barReceived(socket: SocketIO.Socket, userEmail: string) {
          clients[userEmail] = new Client(userEmail.toString());
-        // clients.set(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}`));
-        // console.log(magenta(`currently connected: ${[...clients.entries()]}`));
-        // console.log(magenta('socket map below'));
-        // console.log([...socketMap.entries()]);
         printActiveUsers();
 
         timeMap[userEmail] = Date.now();
@@ -321,7 +326,8 @@ 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;
@@ -367,11 +373,8 @@ export namespace WebSocket {
     var CurUser: string | undefined = undefined;
 
     function UpdateField(socket: Socket, diff: Diff) {
-        console.log(magenta(`1 OP ${socketMap.get(socket)}`));
-
         let currentUsername = socketMap.get(socket)!.split(' ')[0];
         userOperations.set(currentUsername, userOperations.get(currentUsername) !== undefined ? userOperations.get(currentUsername)! + 1 : 0);
-        console.log(yellow("Total Operations: " + userOperations.get(currentUsername)));
         
         if (CurUser !== socketMap.get(socket)) {
             CurUser = socketMap.get(socket);