Usernames and exclude sender

1 files changed, 19 insertions, 4 deletions

diff --git a/Year_3/Web/chat-socket-io/index.js b/Year_3/Web/chat-socket-io/index.js
index 6224c50..b59cb72 100644
--- a/Year_3/Web/chat-socket-io/index.js
+++ b/Year_3/Web/chat-socket-io/index.js
@@ -13,19 +13,34 @@ app.get("/", (req, res) => {
     res.render("index");
 });
 
-app.get("/chat.js", (req, res) => {
-    res.sendFile(__dirname + "/chat.js");
+app.use(express.static("assets"));
+
+app.get("*", (req, res) => {
+    res.render("404");
 });
 
+const users = {};
+
 io.on("connection", (socket) => {
-    console.log("A user is connected");
+    console.log("A user is connected: " + socket.id);
+    io.to(socket.id).emit("set user", socket.id);
+    users[socket.id] = socket.id;
 
     socket.on("disconnect", () => {
         console.log("A user is disconnected");
     });
 
     socket.on("chat message", (message) => {
-        io.emit("chat message", message);
+        socket.broadcast.emit("chat message", message);
+    });
+
+    socket.on("handle error", (msg) => {
+        io.emit("handle error", msg);
+    });
+
+    socket.on("set user", (username) => {
+        users[socket.id] = username;
+        io.to(socket.id).emit("set user", username);
     });
 });