3 files changed, 59 insertions, 5 deletions

diff --git a/src/Utils.ts b/src/Utils.ts
index 4b892aa70..b481b3b47 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -1,6 +1,6 @@
 import v4 = require('uuid/v4');
 import v5 = require("uuid/v5");
-import { Socket } from 'socket.io';
+import { Socket, Room } from 'socket.io';
 import { Message } from './server/Message';
 import { RouteStore } from './server/RouteStore';
 
@@ -211,6 +211,12 @@ export namespace Utils {
             handler([arg, loggingCallback('S sending', fn, message.Name)]);
         });
     }
+    export type RoomHandler = (socket: Socket, room: string) => any;
+    export type UsedSockets = Socket | SocketIOClient.Socket;
+    export type RoomMessage = "create or join" | "created" | "joined";
+    export function AddRoomHandler(socket: Socket, message: RoomMessage, handler: RoomHandler) {
+        socket.on(message, room => handler(socket, room));
+    }
 }
 
 export function OmitKeys(obj: any, keys: string[], addKeyFunc?: (dup: any) => void): { omit: any, extract: any } {
diff --git a/src/server/Message.ts b/src/server/Message.ts
index 7b72b693e..60ffa215f 100644
--- a/src/server/Message.ts
+++ b/src/server/Message.ts
@@ -42,6 +42,11 @@ export interface Diff extends Reference {
     readonly diff: any;
 }
 
+export interface RoomMessage {
+    readonly message: string;
+    readonly room: string;
+}
+
 export namespace MessageStore {
     export const Foo = new Message<string>("Foo");
     export const Bar = new Message<string>("Bar");
@@ -58,5 +63,8 @@ export namespace MessageStore {
     export const YoutubeApiQuery = new Message<YoutubeQueryInput>("Youtube Api Query");
     export const DeleteField = new Message<string>("Delete field");
     export const DeleteFields = new Message<string[]>("Delete fields");
-    export const NotifyRoommates = new Message<string>("Notify Roommates");
+    export const NotifyRoommates = new Message<RoomMessage>("Notify Roommates");
+    export const HangUpCall = new Message<string>("bye");
+
+
 }
diff --git a/src/server/index.ts b/src/server/index.ts
index 6b884d099..b37822eec 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -24,7 +24,7 @@ import { getForgot, getLogin, getLogout, getReset, getSignup, postForgot, postLo
 import { DashUserModel } from './authentication/models/user_model';
 import { Client } from './Client';
 import { Database } from './database';
-import { MessageStore, Transferable, Types, Diff, YoutubeQueryTypes as YoutubeQueryType, YoutubeQueryInput } from "./Message";
+import { MessageStore, Transferable, Types, Diff, YoutubeQueryTypes as YoutubeQueryType, YoutubeQueryInput, RoomMessage } from "./Message";
 import { RouteStore } from './RouteStore';
 import v4 = require('uuid/v4');
 const app = express();
@@ -777,6 +777,10 @@ server.on("connection", function (socket: Socket) {
     Utils.AddServerHandlerCallback(socket, MessageStore.GetRefField, GetRefField);
     Utils.AddServerHandlerCallback(socket, MessageStore.GetRefFields, GetRefFields);
     Utils.AddServerHandler(socket, MessageStore.NotifyRoommates, message => HandleRoommateNotification(socket, message));
+    Utils.AddServerHandler(socket, MessageStore.HangUpCall, message => HandleHangUp(socket, message));
+    Utils.AddRoomHandler(socket, "create or join", HandleCreateOrJoin);
+
+
 
 
 });
@@ -840,9 +844,45 @@ function HandleYoutubeQuery([query, callback]: [YoutubeQueryInput, (result?: any
     }
 }
 
-function HandleRoommateNotification(socket: Socket, message: String) {
-    socket.broadcast.emit('message', message);
+function HandleRoommateNotification(socket: Socket, message: RoomMessage) {
+    //socket.broadcast.emit('message', message);
+    server.sockets.in(message.room).emit('message', message.message);
+
+}
+
+function HandleCreateOrJoin(socket: io.Socket, room: string) {
+    console.log("Received request to create or join room " + room);
+
+
+    let clientsInRoom = server.sockets.adapter.rooms[room];
+    let numClients = clientsInRoom ? Object.keys(clientsInRoom.sockets).length : 0;
+    console.log('Room ' + room + ' now has ' + numClients + ' client(s)');
+
+
+    if (numClients === 0) {
+        socket.join(room);
+        console.log('Client ID ' + socket.id + ' created room ' + room);
+        socket.emit('created', room, socket.id);
+
+    } else if (numClients === 1) {
+        console.log('Client ID ' + socket.id + ' joined room ' + room);
+        server.sockets.in(room).emit('join', room);
+        socket.join(room);
+        socket.emit('joined', room, socket.id);
+        server.sockets.in(room).emit('ready');
+
+    } else {
+        socket.emit('full', room);
+    }
+
+
+
+
+
+}
 
+function HandleHangUp(socket: io.Socket, message: string) {
+    console.log("Receive bye from someone");
 }
 
 const credentialsPath = path.join(__dirname, "./credentials/google_docs_credentials.json");