From 9b36fe0bc85a14def77faa0d3210f360c5035ef4 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 19 Dec 2016 14:46:37 +0200 Subject: [PATCH] chore(cloudcmd) es2015-ify --- lib/cloudcmd.js | 107 ++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 57 deletions(-) diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js index 88dfb1e1..9dcb3315 100644 --- a/lib/cloudcmd.js +++ b/lib/cloudcmd.js @@ -1,46 +1,38 @@ 'use strict'; -var DIR = __dirname + '/'; -var DIR_ROOT = DIR + '../'; -var DIR_SERVER = DIR + 'server/'; -var DIR_COMMON = DIR + '../common/'; +const DIR = __dirname + '/'; +const DIR_ROOT = DIR + '../'; +const DIR_SERVER = DIR + 'server/'; +const DIR_COMMON = DIR + '../common/'; -var cloudfunc = require(DIR_COMMON + 'cloudfunc'); +const cloudfunc = require(DIR_COMMON + 'cloudfunc'); -var auth = require(DIR_SERVER + 'auth'); -var config = require(DIR_SERVER + 'config'); -var rest = require(DIR_SERVER + 'rest'); -var route = require(DIR_SERVER + 'route'); -var validate = require(DIR_SERVER + 'validate'); -var prefixer = require(DIR_SERVER + 'prefixer'); -var pluginer = require(DIR_SERVER + 'plugins'); +const auth = require(DIR_SERVER + 'auth'); +const config = require(DIR_SERVER + 'config'); +const rest = require(DIR_SERVER + 'rest'); +const route = require(DIR_SERVER + 'route'); +const validate = require(DIR_SERVER + 'validate'); +const prefixer = require(DIR_SERVER + 'prefixer'); +const pluginer = require(DIR_SERVER + 'plugins'); -var apart = require('apart'); -var join = require('join-io'); -var ponse = require('ponse'); -var mollify = require('mollify'); -var restafary = require('restafary'); -var konsole = require('console-io/legacy'); -var edward = require('edward/legacy'); -var dword = require('dword/legacy'); -var deepword = require('deepword/legacy'); -var spero = require('spero'); -var remedy = require('remedy'); -var ishtar = require('ishtar'); -var salam = require('salam/legacy'); -var criton = require('criton'); - -var root = function() { - return config('root'); -}; +const apart = require('apart'); +const join = require('join-io'); +const ponse = require('ponse'); +const mollify = require('mollify'); +const restafary = require('restafary'); +const konsole = require('console-io/legacy'); +const edward = require('edward/legacy'); +const dword = require('dword/legacy'); +const deepword = require('deepword/legacy'); +const spero = require('spero'); +const remedy = require('remedy'); +const ishtar = require('ishtar'); +const salam = require('salam/legacy'); +const criton = require('criton'); -var emptyFunc = function(req, res, next) { - next(); -}; - -emptyFunc.middle = function() { - return emptyFunc; -}; +const root = () => config('root'); +const emptyFunc = (req, res, next) => next(); +emptyFunc.middle = () => emptyFunc; function getPrefix(prefix) { if (typeof prefix === 'function') @@ -50,17 +42,17 @@ function getPrefix(prefix) { } module.exports = function(params) { - var p = params || {}; - var options = p.config || {}; - var plugins = p.plugins; + const p = params || {}; + const options = p.config || {}; + const plugins = p.plugins; - var keys = Object.keys(options); - var prefix; + const keys = Object.keys(options); + let prefix; checkPlugins(plugins); keys.forEach(function(name) { - var value = options[name]; + let value = options[name]; switch(name) { case 'root': @@ -105,8 +97,8 @@ function authCheck(socket, success) { return success(); socket.on('auth', function(name, pass) { - var isName = name === config('username'); - var isPass = pass === config('password'); + const isName = name === config('username'); + const isPass = pass === config('password'); if (isName && isPass) { success(); @@ -118,7 +110,7 @@ function authCheck(socket, success) { } function listen(prefix, socket) { - var size = cloudfunc.MAX_SIZE; + const size = cloudfunc.MAX_SIZE; prefix = getPrefix(prefix); @@ -176,21 +168,21 @@ function listen(prefix, socket) { } function cloudcmd(prefix, plugins) { - var isOption = function(name) { + const isOption = (name) => { return config(name); }; - var isMinify = apart(isOption, 'minify'); - var isOnline = apart(isOption, 'online'); - var isCache = apart(isOption, 'cache'); - var isDiff = apart(isOption, 'diff'); - var isZip = apart(isOption, 'zip'); + const isMinify = apart(isOption, 'minify'); + const isOnline = apart(isOption, 'online'); + const isCache = apart(isOption, 'cache'); + const isDiff = apart(isOption, 'diff'); + const isZip = apart(isOption, 'zip'); - var ponseStatic = ponse.static(DIR_ROOT, { + const ponseStatic = ponse.static(DIR_ROOT, { cache: isCache }); - var funcs = [ + const funcs = [ konsole({ prefix: prefix + '/console', minify: isMinify, @@ -281,9 +273,9 @@ function logout(req, res, next) { } function setUrl(pref) { - return function(req, res, next) { - var prefix = getPrefix(pref); - var is = !req.url.indexOf(prefix); + return (req, res, next) => { + const prefix = getPrefix(pref); + const is = !req.url.indexOf(prefix); if (!is) return next(); @@ -304,3 +296,4 @@ function checkPlugins(plugins) { if (!Array.isArray(plugins)) throw Error('plugins should be an array!'); } +