From 127e163f73d2fbc2c8be79fde6b42c7fc5a15cba Mon Sep 17 00:00:00 2001 From: AlexKvazos Date: Tue, 19 May 2015 20:05:53 -0500 Subject: [PATCH] ES6 Stuff --- app/server/bot/events/end.js | 6 +++--- app/server/bot/events/error.js | 6 +++--- app/server/bot/events/login.js | 6 +++--- app/server/bot/events/message.js | 6 +++--- app/server/bot/events/spawn.js | 6 +++--- app/server/bot/index.js | 2 +- app/server/index.js | 6 +++--- app/server/parsers/extra.js | 6 +++--- app/server/parsers/vanilla.js | 12 ++++++------ app/server/sockets/events/chat.js | 6 +++--- app/server/sockets/events/connection.js | 6 +++--- app/server/sockets/events/disconnection.js | 6 +++--- app/server/sockets/events/players.js | 6 +++--- app/server/sockets/index.js | 2 +- app/server/utils/escapeHtml.js | 2 +- app/server/utils/index.js | 3 +-- app/server/utils/stringToCode.js | 4 ++-- 17 files changed, 45 insertions(+), 46 deletions(-) diff --git a/app/server/bot/events/end.js b/app/server/bot/events/end.js index 9d10ad2..aea8a99 100644 --- a/app/server/bot/events/end.js +++ b/app/server/bot/events/end.js @@ -1,9 +1,9 @@ -module.exports = (socket) => { +export default (socket) => { - function onEnd() { + let onEnd = () => { socket.emit('bot:disconnect'); delete socket.mcbot; - } + }; socket.mcbot.on('end', onEnd); diff --git a/app/server/bot/events/error.js b/app/server/bot/events/error.js index 58a4cc4..97e13d6 100644 --- a/app/server/bot/events/error.js +++ b/app/server/bot/events/error.js @@ -1,6 +1,6 @@ -module.exports = (socket) => { +export default (socket) => { - function onError(error) { + let onError = (error) => { // this is okay because the connection was ended if (error.toString() === 'Error: write after end') return; @@ -14,7 +14,7 @@ module.exports = (socket) => { // delete the bot delete socket.mcbot; - } + }; socket.mcbot.on('error', onError); diff --git a/app/server/bot/events/login.js b/app/server/bot/events/login.js index 568d4e8..cc9d7a2 100644 --- a/app/server/bot/events/login.js +++ b/app/server/bot/events/login.js @@ -1,8 +1,8 @@ import moment from 'moment'; -module.exports = (socket) => { +export default (socket) => { - function onLogin() { + let onLogin = () => { let timestamp = moment().format('MMM D h:mm:ss a'); socket.emit('buffer:success', `Successfully logged in as ${socket.mcbot.username} with entity id ${socket.mcbot.entity.id}`); @@ -12,7 +12,7 @@ module.exports = (socket) => { username: socket.mcbot.username }); console.log(`${timestamp}: logged in > ${socket.connectionParams.hostname}:${socket.connectionParams.port} - Username: ${socket.mcbot.username}`); - } + }; socket.mcbot.on('login', onLogin); diff --git a/app/server/bot/events/message.js b/app/server/bot/events/message.js index 096ace2..72d3653 100644 --- a/app/server/bot/events/message.js +++ b/app/server/bot/events/message.js @@ -3,9 +3,9 @@ import parseExtra from '../../parsers/extra'; import {escapeHtml} from '../../utils'; -module.exports = (socket) => { +export default (socket) => { - function onMessage(message) { + let onMessage = (message) => { // empty buffer var buffer = ''; @@ -44,7 +44,7 @@ module.exports = (socket) => { // send line back to the client socket.emit('bot:message', buffer); - } + }; socket.mcbot.on('message', onMessage); diff --git a/app/server/bot/events/spawn.js b/app/server/bot/events/spawn.js index 20cf113..fb1bbf8 100644 --- a/app/server/bot/events/spawn.js +++ b/app/server/bot/events/spawn.js @@ -1,10 +1,10 @@ -module.exports = (socket) => { +export default (socket) => { - function onSpawn() { + let onSpawn = () => { var pos = socket.mcbot.entity.position; socket.emit('buffer:info', `Spawned at X:${pos.x}, Y:${pos.y}, Z:${pos.z}`); socket.emit('bot:players', socket.mcbot.players); - } + }; socket.mcbot.on('spawn', onSpawn); diff --git a/app/server/bot/index.js b/app/server/bot/index.js index db9d1c3..d2be10b 100644 --- a/app/server/bot/index.js +++ b/app/server/bot/index.js @@ -5,7 +5,7 @@ import message from './events/message'; import end from './events/end'; // bind all listeners to the bot -module.exports = (socket) => { +export default (socket) => { error(socket); login(socket); diff --git a/app/server/index.js b/app/server/index.js index 14db566..ce39147 100755 --- a/app/server/index.js +++ b/app/server/index.js @@ -18,9 +18,9 @@ dotenv.load(); // create express application, server and socketio instance -var app = express(); -var server = createServer(app); -var io = socketio(server); +let app = express(); +let server = createServer(app); +let io = socketio(server); // setup socket.io-redis if connection variables are set diff --git a/app/server/parsers/extra.js b/app/server/parsers/extra.js index 5a1de2f..a7cb86b 100644 --- a/app/server/parsers/extra.js +++ b/app/server/parsers/extra.js @@ -1,14 +1,14 @@ import {stringToCode} from '../utils'; -module.exports = (extra) => { +export default (extra) => { - var string = ''; + let string = ''; // for each piece of text extra.forEach((data) => { // get the text out of the element - var text; + let text; if (typeof data === 'string') { text = data; } else if (typeof data === 'object') { diff --git a/app/server/parsers/vanilla.js b/app/server/parsers/vanilla.js index 07aefb6..9de4fba 100644 --- a/app/server/parsers/vanilla.js +++ b/app/server/parsers/vanilla.js @@ -1,12 +1,12 @@ import {stringToCode} from '../utils'; import parseExtra from '../parsers/extra'; -module.exports = (jsonMsg) => { +export default (jsonMsg) => { - var username, msg, sender, broadcast, connected, max, usage, + let username, msg, sender, broadcast, connected, max, usage, current, pages, player, victim, killer, achievement; - var color = stringToCode(jsonMsg.color); + let color = stringToCode(jsonMsg.color); switch (jsonMsg.translate) { @@ -99,7 +99,7 @@ module.exports = (jsonMsg) => { function parseAdmin(command) { - var player, gamemode, p1, p2; + let player, gamemode, p1, p2; switch (command.translate) { @@ -136,7 +136,7 @@ function parseAdmin(command) { function parseAchievement(achievementid) { - var achievements = { + let achievements = { 'achievement.acquireIron': 'Acquire Hardware', 'achievement.bakeCake': 'The Lie', 'achievement.blazeRod': 'Into Fire', @@ -181,7 +181,7 @@ function parseAchievement(achievementid) { function parseCommandUsage(commandId) { - var commands = { + let commands = { 'commands.achievement.usage': '/achievement [player]', 'commands.ban.usage': '/ban [reason ...]', 'commands.banip.usage': '/ban-ip [reason ...]', diff --git a/app/server/sockets/events/chat.js b/app/server/sockets/events/chat.js index 4c98954..7b0effc 100644 --- a/app/server/sockets/events/chat.js +++ b/app/server/sockets/events/chat.js @@ -1,10 +1,10 @@ -module.exports = (socket) => { +export default (socket) => { - function onChat(data) { + let onChat = (data) => { if (socket.mcbot && socket.mcbot.entity) { socket.mcbot.chat(data.message); } - } + }; socket.on('chat', onChat); diff --git a/app/server/sockets/events/connection.js b/app/server/sockets/events/connection.js index 7587faa..b8a9e26 100644 --- a/app/server/sockets/events/connection.js +++ b/app/server/sockets/events/connection.js @@ -2,9 +2,9 @@ import mineflayer from 'mineflayer'; import moment from 'moment'; import events from '../../bot'; -module.exports = (socket) => { +export default (socket) => { - function onConnection(data) { + let onConnection = (data) => { let timestamp = moment().format('MMM D h:mm:ss a'); @@ -39,7 +39,7 @@ module.exports = (socket) => { // bind bot events events(socket); - } + }; socket.on('server:connect', onConnection); diff --git a/app/server/sockets/events/disconnection.js b/app/server/sockets/events/disconnection.js index f48cf36..6e54883 100644 --- a/app/server/sockets/events/disconnection.js +++ b/app/server/sockets/events/disconnection.js @@ -1,11 +1,11 @@ -module.exports = (socket) => { +export default (socket) => { - function onDisconnection() { + let onDisconnection = () => { if (socket.mcbot) { socket.mcbot.end(); delete socket.mcbot; } - } + }; socket.on('disconnect', onDisconnection); diff --git a/app/server/sockets/events/players.js b/app/server/sockets/events/players.js index 07cbf23..bce6acf 100644 --- a/app/server/sockets/events/players.js +++ b/app/server/sockets/events/players.js @@ -1,10 +1,10 @@ -module.exports = (socket) => { +export default (socket) => { - function onPlayers() { + let onPlayers = () => { if (socket.mcbot && socket.mcbot.players) { socket.emit('bot:players', socket.mcbot.players); } - } + }; socket.on('players', onPlayers); diff --git a/app/server/sockets/index.js b/app/server/sockets/index.js index efee82c..14c5247 100755 --- a/app/server/sockets/index.js +++ b/app/server/sockets/index.js @@ -1,4 +1,4 @@ -module.exports = (io) => { +export default (io) => { io.on('connection', (socket) => { diff --git a/app/server/utils/escapeHtml.js b/app/server/utils/escapeHtml.js index c7955d0..fcbb7b3 100644 --- a/app/server/utils/escapeHtml.js +++ b/app/server/utils/escapeHtml.js @@ -1,4 +1,4 @@ -module.exports = (unsafe) => { +export default (unsafe) => { return unsafe .replace(/&/g, '&') .replace(/ { +export default (string) => { - var dictionary = { + let dictionary = { 'black': 0, 'dark_blue': 1, 'dark_green': 2,