cloudcmd 16.13.0 → 16.14.0

package/server/cloudcmd.js

@@ -1,26 +1,26 @@
 'use strict';
 
-const DIR = __dirname + '/';
-const DIR_COMMON = DIR + '../common/';
+const DIR = `${__dirname}/`;
+const DIR_COMMON = `${DIR}../common/`;
 const path = require('path');
 
 const fs = require('fs');
-const cloudfunc = require(DIR_COMMON + 'cloudfunc');
+const cloudfunc = require(`${DIR_COMMON}cloudfunc`);
 
-const authentication = require(DIR + 'auth');
+const authentication = require(`${DIR}auth`);
 const {
     createConfig,
     configPath,
-} = require(DIR + 'config');
-const modulas = require(DIR + 'modulas');
+} = require(`${DIR}config`);
+const modulas = require(`${DIR}modulas`);
 
-const userMenu = require(DIR + 'user-menu');
-const rest = require(DIR + 'rest');
-const route = require(DIR + 'route');
-const validate = require(DIR + 'validate');
-const prefixer = require(DIR + 'prefixer');
-const terminal = require(DIR + 'terminal');
-const distribute = require(DIR + 'distribute');
+const userMenu = require(`${DIR}user-menu`);
+const rest = require(`${DIR}rest`);
+const route = require(`${DIR}route`);
+const validate = require(`${DIR}validate`);
+const prefixer = require(`${DIR}prefixer`);
+const terminal = require(`${DIR}terminal`);
+const distribute = require(`${DIR}distribute`);
 const currify = require('currify');
 
 const apart = require('apart');
@@ -33,7 +33,7 @@ const dword = require('dword');
 const deepword = require('deepword');
 const nomine = require('nomine');
 const fileop = require('@cloudcmd/fileop');
-const DIR_ROOT = DIR + '../';
+const DIR_ROOT = `${DIR}../`;
 
 const isDev = process.env.NODE_ENV === 'development';
 const getDist = (isDev) => isDev ? 'dist-dev' : 'dist';
@@ -139,35 +139,35 @@ function listen({prefixSocket, socket, config}) {
     edward.listen(socket, {
         root,
         auth,
-        prefixSocket: prefixSocket + '/edward',
+        prefixSocket: `${prefixSocket}/edward`,
     });
     
     dword.listen(socket, {
         root,
         auth,
-        prefixSocket: prefixSocket + '/dword',
+        prefixSocket: `${prefixSocket}/dword`,
     });
     
     deepword.listen(socket, {
         root,
         auth,
-        prefixSocket: prefixSocket + '/deepword',
+        prefixSocket: `${prefixSocket}/deepword`,
     });
     
     config('console') && konsole.listen(socket, {
         auth,
-        prefixSocket: prefixSocket + '/console',
+        prefixSocket: `${prefixSocket}/console`,
     });
     
     fileop.listen(socket, {
         root,
         auth,
-        prefix: prefixSocket + '/fileop',
+        prefix: `${prefixSocket}/fileop`,
     });
     
     config('terminal') && terminal(config).listen(socket, {
         auth,
-        prefix: prefixSocket + '/gritty',
+        prefix: `${prefixSocket}/gritty`,
         command: config('terminalCommand'),
         autoRestart: config('terminalAutoRestart'),
     });

package/server/config.js

@@ -1,15 +1,15 @@
 'use strict';
 
-const DIR_SERVER = __dirname + '/';
+const DIR_SERVER = `${__dirname}/`;
 const DIR_COMMON = '../common/';
 const path = require('path');
 
 const fs = require('fs');
 const Emitter = require('events');
 const {homedir} = require('os');
-const exit = require(DIR_SERVER + 'exit');
+const exit = require(`${DIR_SERVER}exit`);
 
-const CloudFunc = require(DIR_COMMON + 'cloudfunc');
+const CloudFunc = require(`${DIR_COMMON}cloudfunc`);
 const currify = require('currify');
 
 const wraptile = require('wraptile');
@@ -21,7 +21,7 @@ const jju = require('jju');
 const writejson = require('writejson');
 const tryCatch = require('try-catch');
 const criton = require('criton');
-const DIR = DIR_SERVER + '../';
+const DIR = `${DIR_SERVER}../`;
 const HOME = homedir();
 
 const resolve = Promise.resolve.bind(Promise);
@@ -107,8 +107,7 @@ function createConfig({configPath} = {}) {
     };
     
     configManager.unsubscribe = (fn) => {
-        // replace to off on node v10
-        changeEmitter.removeListener('change', fn);
+        changeEmitter.off('change', fn);
     };
     
     return configManager;
@@ -146,7 +145,7 @@ function _connection(manage, socket) {
 function listen(manage, sock, auth) {
     const prefix = manage('prefixSocket');
     
-    sock.of(prefix + '/config')
+    sock.of(`${prefix}/config`)
         .on('connection', (socket) => {
             if (!manage('auth'))
                 return connection(manage, socket);

package/server/distribute/import.js

@@ -9,6 +9,7 @@ const io = require('socket.io-client');
 const log = require('./log');
 
 const env = require('../env');
+const noop = () => {};
 const forEachKey = currify(require('for-each-key'));
 
 const {
@@ -43,7 +44,7 @@ const rmListeners = wraptile((socket, listeners) => {
 
 const canceled = (f) => f(null, {
     status: 'canceled',
-    disconnect: () => {},
+    disconnect: noop,
 });
 
 const done = wraptile((fn, store) => fn(null, {

package/server/markdown/index.js

@@ -17,7 +17,7 @@ threadIt.init();
 // warm up
 parse('');
 
-const DIR_ROOT = __dirname + '/../../';
+const DIR_ROOT = `${__dirname}/../../`;
 
 module.exports = callbackify(async (name, rootDir, request) => {
     check(name, request);

package/server/prefixer.js

@@ -8,7 +8,7 @@ module.exports = (value) => {
         return '';
     
     if (value && !value.includes('/'))
-        return '/' + value;
+        return `/${value}`;
     
     return value;
 };

package/server/rest/index.js

@@ -1,14 +1,14 @@
 'use strict';
 
 const DIR = '../';
-const DIR_COMMON = DIR + '../common/';
+const DIR_COMMON = `${DIR}../common/`;
 
 const path = require('path');
 const fs = require('fs');
 
-const root = require(DIR + 'root');
-const CloudFunc = require(DIR_COMMON + 'cloudfunc');
-const markdown = require(DIR + 'markdown');
+const root = require(`${DIR}root`);
+const CloudFunc = require(`${DIR_COMMON}cloudfunc`);
+const markdown = require(`${DIR}markdown`);
 const info = require('./info');
 
 const jaguar = require('jaguar');
@@ -36,7 +36,7 @@ const UserError = (msg) => {
 
 module.exports = currify((config, request, response, next) => {
     const name = ponse.getPathName(request);
-    const regExp = RegExp('^' + apiURL);
+    const regExp = RegExp(`^${apiURL}`);
     const is = regExp.test(name);
     
     if (!is)

package/server/route.js

@@ -16,9 +16,9 @@ const once = require('once');
 const pipe = require('pipe-io');
 const {contentType} = require('mime-types');
 
-const root = require(DIR_SERVER + 'root');
-const prefixer = require(DIR_SERVER + 'prefixer');
-const CloudFunc = require(DIR_COMMON + 'cloudfunc');
+const root = require(`${DIR_SERVER}root`);
+const prefixer = require(`${DIR_SERVER}prefixer`);
+const CloudFunc = require(`${DIR_COMMON}cloudfunc`);
 
 const Columns = require(`${DIR_SERVER}/columns`);
 
@@ -52,7 +52,7 @@ const getReadDir = (config) => {
  */
 module.exports = currify((config, options, request, response, next) => {
     const name = ponse.getPathName(request);
-    const isFS = RegExp('^/$|^' + FS).test(name);
+    const isFS = RegExp(`^/$|^${FS}`).test(name);
     
     if (!isFS)
         return next();

package/server/server.mjs

@@ -46,7 +46,7 @@ export default async (options, config) => {
         app.use(logger('dev'));
     
     if (prefix)
-        app.get('/', (req, res) => res.redirect(prefix + '/'));
+        app.get('/', (req, res) => res.redirect(`${prefix}/`));
     
     const socketServer = new Server(server, {
         path: `${prefix}/socket.io`,