ES6 + Bunyan logging

Author: Tylian

.gitignore

@@ -14,3 +14,4 @@ results
 client/source/
 
 npm-debug.log
+node_modules/

server/app.js

@@ -1,14 +1,14 @@
 var PolicyServer = require('./src/PolicyServer'),
     LobbyServer = require('./src/LobbyServer'),
     GameServer = require('./src/GameServer');
-    
+
 var package = require('./package.json');
 
 // Set up the logger
-var winston = require('winston');
-winston.cli();
+var bunyan = require('bunyan')
+  , log = bunyan.createLogger({ name: 'app' });
 
-winston.info('Begining startup of ' + package.name + ' v' + package.version);
+log.info('Begining startup of %s v%s', package.name, package.version);
 
 var policyServer = new PolicyServer();
-var lobbyServer = new LobbyServer();
+var lobbyServer = new LobbyServer();

server/package.json

@@ -1,9 +1,10 @@
 {
   "name": "dots-emulator",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "description": "A Click Upon Dots server emulator",
   "main": "app.js",
   "dependencies": {
+    "bunyan": "^1.8.1",
     "winston": "~0.6.2"
   },
   "devDependencies": {},

server/src/GameServer.js

@@ -1,11 +1,15 @@
+'use strict';
+
 var net = require("net")
-  , logger = require('winston')
-  , config = require('../config');
+  , bunyan = require('bunyan')
+  , config = require('../config')
+  , log = bunyan.createLogger({ name: "lobby" });
 
 var GameServer = require('./GameServer'),
     MultiplayerServer = require('./MultiplayerServer');
 
-function LobbyServer() {
+class LobbyServer {
+  constructor() {
     this.history = [];  // Chat history buffer
     this.rooms = [];    // Array of room data
     this.userIds = [];  // Array of currently in use IDs
@@ -17,80 +21,78 @@ function LobbyServer() {
 
     this.port = config.gamePort;
 
-    this.server = new MultiplayerServer();
-
-    var server = this.server;
-    var lobby = this;
+    var server = new MultiplayerServer();
+    this.server = server;
 
-    server.on('connection', function(user) {
-      logger.info('Connection from ' + user.socket.address().address);
+    server.on('connection', user => {
+      log.info('Connection from %s', user.socket.address().address);
 
-      user.id = lobby.getUniqueId();
+      user.id = this.getUniqueId();
       user.name = "User";
       user.fullname = user.name + '`' + user.id;
       user.room = 'none';
 
       user.admin = false;
 
-      lobby.rooms['none'].users.push(user);
+      this.rooms['none'].users.push(user);
     });
 
-    server.on('data', function(user, data) {
+    server.on('data', (user, data) => {
       switch(data[0]) {
         case 'r': // User name
           user.name = data.substr(1);
           user.fullname = user.name + '`' + user.id;
           user.write('d' + user.id, 'g');   // User ID, dequeue
           break;
-          
+
         case 'q': // Quit game room
-          if(lobby.rooms[user.room].started) {
+          if(this.rooms[user.room].started) {
             var room = user.room;
 
-            lobby.rooms[room].started = false;
-            lobby.rooms[room].users.forEach(function(roomUser) {
+            this.rooms[room].started = false;
+            this.rooms[room].users.forEach(roomUser => {
               server.writeAll('l' + roomUser.room + '`' + roomUser.fullname);
               roomUser.room = 'none';
             });
-            
+
             server.writeAll('r' + room);
-            lobby.rooms[room].users = [];
+            this.rooms[room].users = [];
           }
 
           user.write('g');
           break;
-          
+
         case 'o': // Join lobby
           user.writeOthers('j' + user.room + '`' + user.fullname);
-          server.each(function(u) {
+          server.each(u => {
             user.write('j' + u.room + '`' + u.fullname);
           });
 
-          user.write.apply(user, lobby.history);
+          user.write.apply(user, this.history);
 
-          for(var i in lobby.rooms) {
-            if(lobby.rooms[i].started) {
+          for(var i in this.rooms) {
+            if(this.rooms[i].started) {
               user.write('s'+i);
             }
           }
           break;
-          
+
         case 'c': // Chat
           var chat = data.substr(1);
 
           if(chat.substr(0, user.name.length + 9) == '<b>' + user.name + '</b>: ') {
             server.emit('chat', user, chat.substr(user.name.length + 9));
           } else {
-            logger.warn('Malformed chat from ' + user.fullname + '  ' + chat);
+            log.warn('Malformed chat from %s  %s', user.fullname, chat);
           }
           break;
-        
+
         case 'j': // Join room
           // There's a bit of a bug-fix in the client here.
           // If the client requests an invalid room, the client still waits for a "join room" response from the server
           // Even worse, if they're in the "none" room, sending them to the current room doesn't unlock the client.
           // So to work around this, we move them to their current room, or the room they requested then back if they're in "none".
-          if(!lobby.isValidRoom(data.substr(1))) {
+          if(!this.isValidRoom(data.substr(1))) {
             if(user.room == 'none')
               user.write('j' + data.substr(1) + '`' + user.fullname);
 
@@ -99,37 +101,37 @@ function LobbyServer() {
             break;
           }
 
-          lobby.rooms[user.room].removeUser(user);
+          this.rooms[user.room].removeUser(user);
           server.writeAll('l' + user.room + '`' + user.fullname);
 
           user.room = data.substr(1);
-          lobby.rooms[user.room].users.push(user)
+          this.rooms[user.room].users.push(user)
           server.writeAll('j' + user.room + '`' + user.fullname);
           break;
-        
+
         case 's': // Start game
           var room = parseInt(user.room);
 
-          lobby.rooms[user.room].started = true;
-          lobby.rooms[user.room].server = new GameServer(room);
+          this.rooms[user.room].started = true;
+          this.rooms[user.room].server = new GameServer(room);
 
           server.writeAll('s' + user.room);
           break;
-        
-        default: logger.warn('Unknown lobby packet: ' + data);
+
+        default: log.warn('Unknown lobby packet: %s', data);
       }
     });
 
-    server.on('chat', function(user, text) {
+    server.on('chat', (user, text) => {
       var message = '<b>' + user.name + '</b>: ' + text;
 
       if(text[0] != '/') {
         if(user.admin) {
           message = '<font color="#ff0000">' + message + '</font>';
         }
 
-        lobby.history.push('c' + message);
-        lobby.history = lobby.history.slice(-40);
+        this.history.push('c' + message);
+        this.history = this.history.slice(-40);
 
         server.writeAll('c' + message);
       } else {
@@ -150,46 +152,46 @@ function LobbyServer() {
       }
     });
 
-    server.on('disconnect', function(user) {
-        logger.info(user.name + ' disconnected');
+    server.on('disconnect', user => {
+        log.info(' %s disconnected', user.name );
         user.writeOthers('l'+user.room+'`'+user.fullname);
 
-        lobby.userIds.splice(lobby.userIds.indexOf(user.id), 1);
+        this.userIds.splice(this.userIds.indexOf(user.id), 1);
     });
 
-    server.start(lobby.port, function() {
-      logger.info('Lobby server running on port ' + lobby.port);
+    server.start(this.port, () => {
+      log.info('Lobby server running on port %d', this.port);
     });
-}
-
-LobbyServer.prototype.isValidRoom = function(id) {
-  var numberId = parseInt(id, 10);
-  if(isNaN(numberId)) {
-    return id == "none";
   }
-  return numberId >= 1 && numberId <= 12 && this.rooms[id].users.length < 4;
-}
-LobbyServer.prototype.getUniqueId = function() {
-  while(true) {
-    var id = Math.round(Math.random() * 9999);
-    if(this.userIds.indexOf(id) > -1) continue;
-    this.userIds.push(id);
-    return id;
+  isValidRoom(id) {
+    var numberId = parseInt(id, 10);
+    if(isNaN(numberId)) {
+      return id == "none";
+    }
+    return numberId >= 1 && numberId <= 12 && this.rooms[id].users.length < 4;
+  }
+  getUniqueId() {
+    while(true) {
+      var id = Math.round(Math.random() * 9999);
+      if(this.userIds.indexOf(id) > -1) continue;
+      this.userIds.push(id);
+      return id;
+    }
   }
 }
 
-
-function Room() {
-  this.users = [];
-  this.started = false;
-  this.server = null;
-}
-
-Room.prototype.removeUser = function(user) {
-  var index = this.users.indexOf(user);
-  if(index > -1) {
-    this.users.splice(this.users.indexOf(user), 1);
+class Room {
+  constructor() {
+    this.users = [];
+    this.started = false;
+    this.server = null;
+  }
+  removeUser(user) {
+    var index = this.users.indexOf(user);
+    if(index > -1) {
+      this.users.splice(this.users.indexOf(user), 1);
+    }
   }
 }
 
-module.exports = LobbyServer;
+module.exports = LobbyServer;