Use const whenever possible

default/config.js

@@ -20,7 +20,6 @@ module.exports = {
 	},
 	ports: {
 		http: 4000,
-		https: 4001,
-		liveReload: 9000
+		https: 4001
 	}
 }

lib/App/checkRoute.js

@@ -1,4 +1,4 @@
-let requester = Promise.promisifyAll(require('request'))
+const requester = Promise.promisifyAll(require('request'))
 
 module.exports = function*(method, route) {
 	// The purpose of this function is only to write stuff to the console.

lib/App/createDirectories.js

@@ -1,7 +1,7 @@
-let path = require('path')
-let chalk = require('chalk')
-let fs = Promise.promisifyAll(require('fs'))
-let mkdir = Promise.promisify(require('mkdirp'))
+const path = require('path')
+const chalk = require('chalk')
+const fs = Promise.promisifyAll(require('fs'))
+const mkdir = Promise.promisify(require('mkdirp'))
 
 let touchFile = function(filePath, contents, encoding) {
 	return fs.statAsync(filePath).catch(error => {

lib/App/index.js

@@ -1,10 +1,10 @@
-let path = require('path')
-let chalk = require('chalk')
-let Server = require('../Server')
-let Linter = require('../Linter')
-let MarkdownIt = require('markdown-it')
-let loadClass = require('../loadClass')
-let aeroPackage = require('../../package.json')
+const path = require('path')
+const chalk = require('chalk')
+const Server = require('../Server')
+const Linter = require('../Linter')
+const MarkdownIt = require('markdown-it')
+const loadClass = require('../loadClass')
+const aeroPackage = require('../../package.json')
 
 class App {
 	constructor(root) {

lib/App/initEvents.js

@@ -1,4 +1,4 @@
-let EventEmitter = require('events').EventEmitter
+const EventEmitter = require('events').EventEmitter
 
 module.exports = function() {
 	this.events = new EventEmitter()

lib/App/loadCache.js

@@ -1,4 +1,4 @@
-let fs = Promise.promisifyAll(require('fs'))
+const fs = Promise.promisifyAll(require('fs'))
 const outdatedCacheMessage = 'Ignoring cache from an old Aero version'
 
 module.exports = function*() {

lib/App/loadCertificate.js

@@ -1,6 +1,6 @@
-let fs = Promise.promisifyAll(require('fs'))
-let pem = Promise.promisifyAll(require('pem'))
-let path = require('path')
+const fs = Promise.promisifyAll(require('fs'))
+const pem = Promise.promisifyAll(require('pem'))
+const path = require('path')
 
 let isCertificate = file => file.content.startsWith('-----BEGIN CERTIFICATE-----')
 let isPrivateKey = file => file.content.indexOf('PRIVATE KEY-----') !== -1
@@ -23,7 +23,7 @@ module.exports = function*(filePath, fallback, options) {
 	.catch(error => {
 		if(error.code === 'ENOENT')
 			return
-		
+
 		throw error
 	})
 

lib/App/loadConfig.js

@@ -1,4 +1,5 @@
 const defaultConfig = require('../../default/config')
+const chalk = require('chalk')
 
 module.exports = function*() {
 	let configForEmptyApp = Object.assign({}, defaultConfig)
@@ -8,8 +9,16 @@ module.exports = function*() {
 
 	let configPath = this.path('config.json')
 	let configText = yield this.loadFile(configPath, configForEmptyApp)
+	let userConfig = JSON.parse(configText)
+
+	this.config = Object.assign({}, defaultConfig, userConfig)
+
+	// Auto-correct deprecated fields
+	if(this.config.ports && this.config.ports.liveReload) {
+		delete this.config.ports.liveReload
+		require('fs').writeFileSync(configPath, JSON.stringify(userConfig, null, '\t'))
+	}
 
-	this.config = Object.assign({}, defaultConfig, JSON.parse(configText))
 	Object.freeze(this.config)
 
 	this.events.emit('config loaded')

lib/App/loadController.js

@@ -1,4 +1,4 @@
-let path = require('path')
+const path = require('path')
 
 module.exports = function(controllerPath) {
 	// Delete existing controller from cache

lib/App/loadDirectory.js

@@ -1,5 +1,5 @@
-let fs = Promise.promisifyAll(require('fs'))
-let path = require('path')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
 
 // We load all files in the directory but
 // we want to prioritize the loading order specified

lib/App/loadFile.js

@@ -1,4 +1,4 @@
-let fs = Promise.promisifyAll(require('fs'))
+const fs = Promise.promisifyAll(require('fs'))
 
 module.exports = function*(filePath, fallback, options) {
 	options = options || {}

lib/App/loadFonts.js

@@ -1,4 +1,4 @@
-let request = Promise.promisifyAll(require('request'))
+const request = Promise.promisifyAll(require('request'))
 
 const maxRetries = 5
 

lib/App/loadIcons.js

@@ -1,6 +1,6 @@
-let fs = Promise.promisifyAll(require('fs'))
-let getMIMEType = require('mime-types').lookup
-let sizeOf = require('image-size')
+const fs = Promise.promisifyAll(require('fs'))
+const getMIMEType = require('mime-types').lookup
+const sizeOf = require('image-size')
 
 module.exports = function*() {
 	try {

lib/App/loadJSON.js

@@ -1,4 +1,4 @@
-let fs = Promise.promisifyAll(require('fs'))
+const fs = Promise.promisifyAll(require('fs'))
 
 module.exports = function*(file) {
 	try {

lib/App/loadLayout.js

@@ -1,4 +1,4 @@
-let Layout = require('../Layout')
+const Layout = require('../Layout')
 
 module.exports = function*() {
 	this.time('Layout')

lib/App/loadPage.js

@@ -1,6 +1,6 @@
-let fs = Promise.promisifyAll(require('fs'))
-let path = require('path')
-let Page = require('../Page')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
+const Page = require('../Page')
 const windowsSlash = /\\/g
 
 module.exports = function*(pageId, root) {

lib/App/loadPages.js

@@ -1,6 +1,6 @@
-let fs = Promise.promisifyAll(require('fs'))
-let mkdir = Promise.promisify(require('mkdirp'))
-let path = require('path')
+const fs = Promise.promisifyAll(require('fs'))
+const mkdir = Promise.promisify(require('mkdirp'))
+const path = require('path')
 
 let findPages = Promise.coroutine(function*(rootPath) {
 	let dirs =

lib/App/loadScript.js

@@ -1,5 +1,5 @@
-let fs = Promise.promisifyAll(require('fs'))
-let path = require('path')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
 
 module.exports = function*(file) {
 	file = path.resolve(file)

lib/App/loadStartup.js

@@ -1,4 +1,4 @@
-let fs = require('fs')
+const fs = require('fs')
 
 module.exports = function() {
 	// TODO: Delete require.cache

lib/App/loadStyle.js

@@ -1,7 +1,7 @@
-let fs = Promise.promisifyAll(require('fs'))
-let path = require('path')
-let stylus = require('stylus')
-let autoprefixer = require('autoprefixer-stylus')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
+const stylus = require('stylus')
+const autoprefixer = require('autoprefixer-stylus')
 
 module.exports = function*(file) {
 	file = path.resolve(file)

lib/App/loadStyles.js

@@ -1,5 +1,5 @@
-let fs = Promise.promisifyAll(require('fs'))
-let path = require('path')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
 
 module.exports = function*() {
 	let globalStylePath = path.resolve(path.join(this.root, this.config.path.styles, 'config' + this.fileExtension.styles))

lib/App/loadTemplate.js

@@ -1,5 +1,5 @@
-let fs = Promise.promisifyAll(require('fs'))
-let pug = require('pug')
+const fs = Promise.promisifyAll(require('fs'))
+const pug = require('pug')
 
 module.exports = function*(file) {
 	try {

lib/App/loadText.js

@@ -1,4 +1,4 @@
-let fs = Promise.promisifyAll(require('fs'))
+const fs = Promise.promisifyAll(require('fs'))
 
 module.exports = function*(file) {
 	try {

lib/App/minifyScripts.js

@@ -1,4 +1,4 @@
-let uglifyJS = require('uglify-js-harmony')
+const uglifyJS = require('uglify-js-harmony')
 
 const uglifyJSOptions = {
 	fromString: true,

lib/App/registerEventListeners.js

@@ -1,4 +1,4 @@
-let path = require('path')
+const path = require('path')
 
 module.exports = function() {
 	// Layout modifications

lib/App/routePage.js

@@ -1,5 +1,5 @@
-let xxhash = require('xxhash')
-let zlib = require('zlib')
+const xxhash = require('xxhash')
+const zlib = require('zlib')
 
 // This should be close to the MTU size of a TCP packet.
 // Regarding performance it makes no sense to compress smaller files.

lib/App/saveCache.js

@@ -1,4 +1,4 @@
-let fs = Promise.promisifyAll(require('fs'))
+const fs = Promise.promisifyAll(require('fs'))
 
 module.exports = function() {
 	if(!this.cache)

lib/App/startLiveReload.js

@@ -1,4 +1,4 @@
-let LiveReload = require('../LiveReload')
+const LiveReload = require('../LiveReload')
 
 module.exports = function() {
 	if(this.production)

lib/App/watchFiles.js

@@ -1,6 +1,6 @@
-let path = require('path')
-let fs = require('fs')
-let nodeWatch = require('node-watch')
+const path = require('path')
+const fs = require('fs')
+const nodeWatch = require('node-watch')
 
 let watch = function(fileName, callback, recursive) {
 	nodeWatch(fileName, {

lib/Layout/index.js

@@ -1,5 +1,5 @@
-let loadClass = require('../loadClass')
-let path = require('path')
+const loadClass = require('../loadClass')
+const path = require('path')
 
 class Layout {
 	constructor(app, layoutPath) {

lib/Layout/load.js

@@ -1,5 +1,5 @@
-let fs = Promise.promisifyAll(require('fs'))
-let path = require('path')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
 
 module.exports = function*() {
 	let components = yield {

lib/LiveReload/index.js

@@ -1,7 +1,7 @@
-let WebSocket = require('uws')
-let UglifyJS = require('uglify-js-harmony')
-let chalk = require('chalk')
-let scriptPath = require.resolve('./reload.client.js')
+const WebSocket = require('uws')
+const UglifyJS = require('uglify-js-harmony')
+const chalk = require('chalk')
+const scriptPath = require.resolve('./reload.client.js')
 
 class LiveReload {
 	constructor(app) {
@@ -13,19 +13,32 @@ class LiveReload {
 			this.protocol = 'ws'
 		}
 
-		this.port = app.config.ports.liveReload
-		this.script = UglifyJS.minify(scriptPath, {
+		this.port = 45032
+
+		this.scriptCode = UglifyJS.minify(scriptPath, {
 			compress: {
 				screw_ie8: true
 			},
 			mangle: {
 				screw_ie8: true
 			}
-		}).code.replace('${protocol}', this.protocol).replace('${port}', this.port)
+		}).code.replace('${protocol}', this.protocol)
 
 		// Keep track of sockets to destroy them later
 		this.trackConnections(this.http, this)
 
+		// Automatically find an open port when listening fails
+		this.http.on('error', error => {
+			this.findPort()
+		})
+
+		// Listen
+		this.findPort()
+	}
+
+	findPort() {
+		this.port += 1
+
 		// Listen
 		this.http.listen(this.port, error => {
 			if(error)
@@ -34,6 +47,8 @@ class LiveReload {
 			this.server = new WebSocket.Server({
 				server: this.http
 			})
+
+			this.script = this.scriptCode.replace('${port}', this.port)
 		})
 	}
 

lib/Page/index.js

@@ -1,5 +1,5 @@
-let loadClass = require('../loadClass')
-let path = require('path')
+const loadClass = require('../loadClass')
+const path = require('path')
 
 class Page {
 	constructor(app, id, realPath) {

lib/Page/load.js

@@ -1,6 +1,6 @@
-let fs = Promise.promisifyAll(require('fs'))
-let path = require('path')
-let chalk = require('chalk')
+const fs = Promise.promisifyAll(require('fs'))
+const path = require('path')
+const chalk = require('chalk')
 
 let freezeCurrentProperties = function(obj) {
 	for(let i in obj) {

lib/Server/index.js

@@ -1,4 +1,4 @@
-let loadClass = require('../loadClass')
+const loadClass = require('../loadClass')
 
 require('./response')
 

lib/Server/onRequest.js

@@ -1,4 +1,4 @@
-let querystring = require('querystring')
+const querystring = require('querystring')
 
 const emptyArray = []
 

lib/Server/response/json.js

@@ -1,4 +1,4 @@
-let http = require('http')
+const http = require('http')
 
 http.ServerResponse.prototype.json = function(data) {
 	if(!this.headersSent) {

lib/Server/response/redirect.js

@@ -1,4 +1,4 @@
-let http = require('http')
+const http = require('http')
 
 http.ServerResponse.prototype.redirect = function(url, status) {
 	this.writeHead(status || 302, {

lib/Server/response/sendFile.js

@@ -1,7 +1,7 @@
-let http = require('http')
-let fs = require('fs')
-let path = require('path')
-let getMIMEType = require('mime-types').lookup
+const http = require('http')
+const fs = require('fs')
+const path = require('path')
+const getMIMEType = require('mime-types').lookup
 
 http.ServerResponse.prototype.sendFile = function(file) {
 	fs.stat(file, (statError, stats) => {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aero",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"description": "The fastest node.js framework.",
 	"repository": "aerojs/aero",
 	"homepage": "https://github.com/aerojs/aero",