Merge branch 'master' of https://github.com/brown-dash/Dash-Web

1 files changed, 12 insertions, 1 deletions

diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 13d7237f6..0c79c1bbb 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -187,7 +187,7 @@ export namespace WebSocket {
             + currentdate.getMinutes() + ":"
             + currentdate.getSeconds();
         console.log(blue(`user ${userEmail} has connected to the web socket at: ${datetime}`));
-        socketMap.set(socket, userEmail);
+        socketMap.set(socket, userEmail + " at " + datetime);
     }
 
     function getField([id, callback]: [string, (result?: Transferable) => void]) {
@@ -338,7 +338,18 @@ export namespace WebSocket {
         if (!pendingOps.get(id)!.length) pendingOps.delete(id);
     }
 
+    function printActiveUsers() {
+        socketMap.forEach((user, socket) => {
+            !socket.disconnected && console.log(user);
+        });
+    }
+    var CurUser: string | undefined = undefined;
+
     function UpdateField(socket: Socket, diff: Diff) {
+        if (CurUser !== socketMap.get(socket)) {
+            CurUser = socketMap.get(socket);
+            console.log("Switch User: " + CurUser);
+        }
         if (pendingOps.has(diff.id)) {
             pendingOps.get(diff.id)!.push({ diff, socket });
             return true;