1 files changed, 30 insertions, 1 deletions
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 68b003496..2acdaa5a3 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -12,6 +12,7 @@ import { GoogleCredentialsLoader, SSL } from './apis/google/CredentialsLoader';
 import YoutubeApi from './apis/youtube/youtubeApiSample';
 import { initializeGuest } from './authentication/DashUserModel';
 import { Client } from './Client';
+import { DashStats } from './DashStats';
 import { Database } from './database';
 import { DocumentsCollection } from './IDatabase';
 import { Diff, GestureContent, MessageStore, MobileDocumentUploadContent, MobileInkOverlayContent, Transferable, Types, UpdateMobileInkOverlayPositionContent, YoutubeQueryInput, YoutubeQueryTypes } from './Message';
@@ -20,8 +21,9 @@ import { resolvedPorts } from './server_Initialization';
 
 export namespace WebSocket {
     export let _socket: Socket;
-    const clients: { [key: string]: Client } = {};
+    export const clients: { [key: string]: Client } = {};
     export const socketMap = new Map<SocketIO.Socket, string>();
+    export const userOperations = new Map<string, number>();
     export let disconnect: Function;
 
     export async function initialize(isRelease: boolean, app: express.Express) {
@@ -49,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]);
@@ -97,6 +101,15 @@ export namespace WebSocket {
                 console.log('received bye');
             });
 
+            socket.on('disconnect', function () {
+                let currentUser = socketMap.get(socket);
+                if (!(currentUser === undefined)) {
+                    let currentUsername = currentUser.split(' ')[0];
+                    DashStats.logUserLogout(currentUsername, socket);
+                    delete timeMap[currentUsername];
+                }
+            });
+
             Utils.Emit(socket, MessageStore.Foo, 'handshooken');
 
             Utils.AddServerHandler(socket, MessageStore.Bar, guid => barReceived(socket, guid));
@@ -130,6 +143,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) {
@@ -176,7 +195,12 @@ export namespace WebSocket {
         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}`));
+        printActiveUsers();
+
+        timeMap[userEmail] = Date.now();
         socketMap.set(socket, userEmail + ' at ' + datetime);
+        userOperations.set(userEmail, 0);
+        DashStats.logUserLogin(userEmail, socket);
     }
 
     function getField([id, callback]: [string, (result?: Transferable) => void]) {
@@ -346,6 +370,11 @@ export namespace WebSocket {
     var CurUser: string | undefined = undefined;
 
     function UpdateField(socket: Socket, diff: Diff) {
+        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);