From a232da999dd059028ed1ebde677c0aeb349b2bd7 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 26 Sep 2018 14:34:14 +0300 Subject: [PATCH] chore(cloudcmd) es2018-ify --- bin/cloudcmd.js | 6 ++---- package.json | 2 +- server/cloudcmd.js | 6 ++++-- server/columns.js | 8 ++++---- server/config.js | 20 ++++++++++++-------- server/distribute/import.js | 5 +++-- server/route.js | 5 +++-- server/show-config.js | 2 +- server/terminal.js | 4 +--- 9 files changed, 31 insertions(+), 27 deletions(-) diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index 5a047b54..94f65239 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -5,7 +5,7 @@ const Info = require('../package'); const DIR_SERVER = '../server/'; -const promisify = require('es6-promisify').promisify; +const {promisify} = require('util'); const wraptile = require('wraptile'); const exit = require(DIR_SERVER + 'exit'); @@ -241,9 +241,7 @@ function readConfig(name) { mode: 'json' }); - const result = tryCatch(readjsonSync, name); - const error = result[0]; - const data = result[1]; + const [error, data] = tryCatch(readjsonSync, name); if (error) return exit(error.message); diff --git a/package.json b/package.json index 6c23545e..57d338a3 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,6 @@ "deepword": "^3.0.0", "dword": "^7.0.0", "edward": "^7.0.0", - "es6-promisify": "^6.0.0", "execon": "^1.2.0", "express": "^4.13.0", "files-io": "^2.0.0", @@ -180,6 +179,7 @@ "domtokenlist-shim": "^1.2.0", "emitify": "^3.0.2", "es6-promise": "^4.0.5", + "es6-promisify": "^6.0.0", "eslint": "^5.0.0", "eslint-plugin-node": "^7.0.0", "extract-text-webpack-plugin": "^4.0.0-alpha.0", diff --git a/server/cloudcmd.js b/server/cloudcmd.js index b61abb21..7dfcd2b0 100644 --- a/server/cloudcmd.js +++ b/server/cloudcmd.js @@ -49,8 +49,10 @@ const clean = (a) => a.filter(notEmpty); module.exports = (params) => { const p = params || {}; const options = p.config || {}; - const plugins = p.plugins; - const modules = p.modules; + const { + modules, + plugins, + } = p; const keys = Object.keys(options); diff --git a/server/columns.js b/server/columns.js index 5e49aaa3..d6f2b952 100644 --- a/server/columns.js +++ b/server/columns.js @@ -22,8 +22,8 @@ const names = fs.readdirSync(columnsDir) const columns = readFilesSync(columnsDir, names, 'utf8'); -module.exports = Object.assign( - columns, - defaultColumns -); +module.exports = { + ...columns, + ...defaultColumns, +}; diff --git a/server/config.js b/server/config.js index 8a149685..6e623e4c 100644 --- a/server/config.js +++ b/server/config.js @@ -7,6 +7,8 @@ const DIR = DIR_SERVER + '../'; const path = require('path'); const fs = require('fs'); const Emitter = require('events'); +const {promisify} = require('util'); +const {homedir} = require('os'); const exit = require(DIR_SERVER + 'exit'); const CloudFunc = require(DIR_COMMON + 'cloudfunc'); @@ -14,7 +16,6 @@ const CloudFunc = require(DIR_COMMON + 'cloudfunc'); const currify = require('currify'); const wraptile = require('wraptile'); const squad = require('squad'); -const promisify = require('es6-promisify').promisify; const tryToCatch = require('try-to-catch'); const pullout = promisify(require('pullout')); const ponse = require('ponse'); @@ -23,7 +24,7 @@ const jju = require('jju'); const writejson = require('writejson'); const tryCatch = require('try-catch'); const criton = require('criton'); -const HOME = require('os').homedir(); +const HOME = homedir(); const manageConfig = squad(traverse, cryptoPass); const save = promisify(_save); @@ -47,14 +48,16 @@ const readjsonSync = (name) => { const rootConfig = readjsonSync(ConfigPath); const key = (a) => Object.keys(a).pop(); -const result = tryCatch(readjsonSync, ConfigHome); -const error = result[0]; -const configHome = result[1]; +const [error, configHome] = tryCatch(readjsonSync, ConfigHome); if (error && error.code !== 'ENOENT') exit(`cloudcmd --config ${ConfigHome}: ${error.message}`); -const config = Object.assign({}, rootConfig, configHome); +const config = { + ...rootConfig, + ...configHome, +}; + const connectionWraped = wraptile(connection); module.exports = manage; @@ -222,9 +225,10 @@ function cryptoPass(json) { const password = criton(json.password, algo); - return Object.assign({}, json, { + return { + ...json, password, - }); + }; } function check(socket, auth) { diff --git a/server/distribute/import.js b/server/distribute/import.js index 082d15ff..f0af9477 100644 --- a/server/distribute/import.js +++ b/server/distribute/import.js @@ -80,9 +80,10 @@ module.exports = (options, fn) => { }); const url = `${importUrl}/distribute?${query}`; - const socket = io.connect(url, Object.assign({}, { + const socket = io.connect(url, { + ...options, rejectUnauthorized: false, - }, options)); + }); const superFn = wrapApply(fn, socket.close.bind(socket)); const colorUrl = getColorUrl(importUrl, name); diff --git a/server/route.js b/server/route.js index c088307d..a03cf373 100644 --- a/server/route.js +++ b/server/route.js @@ -21,9 +21,10 @@ const CloudFunc = require(DIR_COMMON + 'cloudfunc'); const prefix = squad(prefixer, apart(config, 'prefix')); const sendIndex = (params, data) => { - const ponseParams = Object.assign({}, params, { + const ponseParams = { + ...params, name: 'index.html' - }); + }; ponse.send(data, ponseParams); }; diff --git a/server/show-config.js b/server/show-config.js index b9902b03..e2420595 100644 --- a/server/show-config.js +++ b/server/show-config.js @@ -1,7 +1,7 @@ 'use strict'; const t = require('table'); -const table = t.table; +const {table} = t; const getBorderCharacters = t.getBorderCharacters; module.exports = (config) => { diff --git a/server/terminal.js b/server/terminal.js index b06d4d66..af40d224 100644 --- a/server/terminal.js +++ b/server/terminal.js @@ -12,9 +12,7 @@ function getTerminal(term, arg) { if (!term) return noop; - const result = tryCatch(require, config('terminalPath')); - const e = result[0]; - const terminalModule = result[1]; + const [e, terminalModule] = tryCatch(require, config('terminalPath')); if (!e && !arg) return terminalModule;