From 32b5a6030f8e6f76106782f427de8ca3875d2392 Mon Sep 17 00:00:00 2001 From: Amber Date: Fri, 15 Jan 2016 15:52:54 +0800 Subject: [PATCH 1/2] resolved server.js to es6 --- server.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/server.js b/server.js index 171e780..21f39bc 100644 --- a/server.js +++ b/server.js @@ -20,10 +20,10 @@ app.get('/', function (req, res) { var onLineUsers = []; var roomList = [ 'javascript', 'nodejs', 'reactjs', 'reactnative' ]; -io.on('connection', function (socket) { +io.on('connection', socket => { // listening login with userName and will broadcast the user joined message // and also the onLineUsers list. - socket.on('login',function (userName) { + socket.on('login', userName => { socket.userName = userName; onLineUsers.push(socket.userName); socket.emit('login',userName); @@ -31,18 +31,15 @@ io.on('connection', function (socket) { socket.emit('roomlist', roomList); // io.emit('userlist',onLineUsers); }); - socket.on('addroom', function (roomName) { - console.log(roomName); + socket.on('addroom', roomName => { roomList.push(roomName); - console.log(roomList); }); // listening the chating message and broadcast to the room - socket.on('chat', function (msg) { - console.log('Socket %s say: %s', socket.userName,msg); + socket.on('chat', msg => { io.emit('chat',`${socket.userName}:${msg}`); }); // when user left the room and - socket.on('disconnect', function () { + socket.on('disconnect', () => { // check it var indexOfUser = onLineUsers.indexOf(socket.userName); var _tmp = @@ -53,6 +50,10 @@ io.on('connection', function (socket) { }); }); -http.listen(3000, function () { - console.log('listening on: 3000'); +http.listen(3000, 'localhost', err => { + if (err) { + console.error(err); + return; + } + console.log('Listening at http://localhost:3000'); }); From 0118b3c0fa5579a034e73fc6ac26c5f6f3202559 Mon Sep 17 00:00:00 2001 From: Amber Date: Fri, 15 Jan 2016 19:35:20 +0800 Subject: [PATCH 2/2] resolve server to es6 --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 21f39bc..0e80b8d 100644 --- a/server.js +++ b/server.js @@ -13,7 +13,7 @@ app.use(require('webpack-dev-middleware')(compiler, { })); app.use(require('webpack-hot-middleware')(compiler)); -app.get('/', function (req, res) { +app.get('/', (req, res) => { res.sendFile(path.join(__dirname, 'index.html')); });