Merge commit '49433257c83247ff0bbb6cfb461be0ce22b50703' into HEAD

src/server.js

@@ -1,4 +1,5 @@
 const net = require("net")
+const User = require("../src/user.js")
 
 const RPL_WELCOME = '001'
 const ERR_NOSUCHNICK = '401'
@@ -9,26 +10,16 @@ const ERR_ERRONEUSNICKNAME = '432'
 const ERR_NICKNAMEINUSE = '433'
 const ERR_NEEDMOREPARAMS = '461'
 
-
 let server = {}
-let userlist = {
-    0:
-        {
-            "nick": "chris",
-            1: "some value"
-        },
-    1:
-        {
-            "nick": "wayne",
-            1: "some_other_value"
-        }
-}
+let registeredUserlist = require("../src/userlist.js")
 
 server.create = function create() {
     return net.createServer((socket) => {
+        const user = new User(socket)
         socket.on('data', function (data) {
             let tokenized = data.toString("ascii").split("\r\n")[0].split(" ")
-            switch (tokenized[0].toUpperCase()) {
+            let command = tokenized[0].toUpperCase()
+            switch (command) {
                 case  "PING":
                     if (tokenized[1] && tokenized[1] === "irc.example.com") {
                         socket.write("PONG irc.example.com\r\n")
@@ -37,19 +28,10 @@ server.create = function create() {
                 case "NICK":
                     if (tokenized[1]) {
                         let nickname = tokenized[1]
-                        let nickNameCollision = 0
-                        for (let clientID in userlist) {
-                            console.log(clientID)
-                            if (userlist[clientID]["nick"] === nickname) {
-                                nickNameCollision = 1
-                                delete userlist[clientID]
-                            }
-                        }
-                        if (!nickNameCollision) {
-                            let index = Object.keys(userlist).length
-                            userlist[index] = {
-                                "nick": nickname
-                            }
+                        // nick collision test
+                        if (!Object.keys(registeredUserlist).includes(nickname)) {
+                            user.setNickname(nickname)
+                            registeredUserlist[nickname] = user
                             socket.write(RPL_WELCOME, " nick " + nickname + " succesfully added.")
                         } else {
                             socket.write(ERR_NICKNAMEINUSE, " nickname in use")
@@ -62,7 +44,7 @@ server.create = function create() {
 
                     break;
                 default:
-                    console.error(`Unknown command: ${tokenized[0].toUpperCase()}`);
+                    console.error(`Unknown command: ${command}`);
             }
         }).on('error', (err) => {
             console.error(err);

src/user.js

@@ -0,0 +1,12 @@
+const userlist = require("../src/userlist.js")
+
+function User(socket) {
+  this.nickname = ""
+  this.connection = socket
+
+  this.setNickname = function(nickname) {
+    this.nickname = nickname
+  }
+}
+
+module.exports = User

src/userlist.js

@@ -0,0 +1,3 @@
+let userlist = {}
+
+module.exports = userlist