cloudcmd 16.1.0 → 16.3.0

package/dist-dev/modules/terminal-run.js

@@ -163,7 +163,7 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n/* global CloudCmd, gritty */\n\nconst {\n  promisify\n} = __webpack_require__(/*! es6-promisify */ \"./node_modules/es6-promisify/dist/promisify.mjs\");\n\nconst tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\n\nconst fullstore = __webpack_require__(/*! fullstore */ \"./node_modules/fullstore/lib/fullstore.js\");\n\n__webpack_require__(/*! ../../css/terminal.css */ \"./css/terminal.css\");\n\nconst exec = __webpack_require__(/*! execon */ \"./node_modules/execon/lib/exec.js\");\n\nconst load = __webpack_require__(/*! load.js */ \"./node_modules/load.js/lib/load.js\");\n\nconst DOM = __webpack_require__(/*! ../dom */ \"./client/dom/index.js\");\n\nconst Images = __webpack_require__(/*! ../dom/images */ \"./client/dom/images.js\");\n\nconst {\n  Dialog\n} = DOM;\nconst {\n  Key,\n  config\n} = CloudCmd;\nCloudCmd.TerminalRun = exports;\nlet Loaded;\nlet Terminal;\nlet Socket;\nconst exitCodeStore = fullstore();\n\nconst loadAll = async () => {\n  const {\n    prefix\n  } = CloudCmd;\n  const prefixGritty = getPrefix();\n  const js = `${prefixGritty}/gritty.js`;\n  const css = `${prefix}/dist/terminal.css`;\n  const [e] = await tryToCatch(load.parallel, [js, css]);\n\n  if (e) {\n    const src = e.target.src.replace(window.location.href, '');\n    return Dialog.alert(`file ${src} could not be loaded`);\n  }\n\n  Loaded = true;\n};\n\nmodule.exports.init = async () => {\n  if (!config('terminal')) return;\n  Images.show.load('top');\n  await CloudCmd.View();\n  await loadAll();\n};\n\nmodule.exports.show = promisify(function () {\n  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};\n  let fn = arguments.length > 1 ? arguments[1] : undefined;\n  if (!Loaded) return;\n  if (!config('terminal')) return;\n  create(options);\n  CloudCmd.View.show(Terminal.element, {\n    afterShow: () => {\n      Terminal.focus();\n    },\n    afterClose: () => {\n      fn(null, exitCodeStore());\n    }\n  });\n});\nmodule.exports.hide = hide;\n\nfunction hide() {\n  CloudCmd.View.hide();\n}\n\nfunction getPrefix() {\n  return CloudCmd.prefix + '/gritty';\n}\n\nfunction getPrefixSocket() {\n  return CloudCmd.prefixSocket + '/gritty';\n}\n\nfunction getEnv() {\n  return {\n    ACTIVE_DIR: DOM.getCurrentDirPath,\n    PASSIVE_DIR: DOM.getNotCurrentDirPath,\n    CURRENT_NAME: DOM.getCurrentName,\n    CURRENT_PATH: DOM.getCurrentPath\n  };\n}\n\nfunction create(createOptions) {\n  const {\n    cwd = DOM.getCurrentDirPath(),\n    command,\n    autoClose,\n    closeMessage = 'Press any key to close Terminal...'\n  } = createOptions;\n  const options = {\n    cwd,\n    env: getEnv(),\n    prefix: getPrefixSocket(),\n    socketPath: CloudCmd.prefix,\n    fontFamily: 'Droid Sans Mono',\n    command,\n    autoRestart: false\n  };\n  let commandExit = false;\n  const {\n    socket,\n    terminal\n  } = gritty(document.body, options);\n  Socket = socket;\n  Terminal = terminal;\n  Terminal.onKey(_ref => {\n    let {\n      domEvent\n    } = _ref;\n    const {\n      keyCode,\n      shiftKey\n    } = domEvent;\n    if (commandExit) hide();\n\n    if (shiftKey && keyCode === Key.ESC) {\n      hide();\n    }\n  });\n  Socket.on('exit', code => {\n    exitCodeStore(code);\n    if (autoClose) return hide();\n    terminal.write(`\\n${closeMessage}`);\n    commandExit = true;\n  });\n  Socket.on('connect', exec.with(authCheck, socket));\n}\n\nfunction authCheck(spawn) {\n  spawn.emit('auth', config('username'), config('password'));\n  spawn.on('reject', () => {\n    Dialog.alert('Wrong credentials!');\n  });\n}\n\n//# sourceURL=file://cloudcmd/client/modules/terminal-run.js");
+eval("\n/* global CloudCmd, gritty */\n\nconst {\n  promisify\n} = __webpack_require__(/*! es6-promisify */ \"./node_modules/es6-promisify/dist/promisify.mjs\");\n\nconst tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\n\nconst fullstore = __webpack_require__(/*! fullstore */ \"./node_modules/fullstore/lib/fullstore.js\");\n\n__webpack_require__(/*! ../../css/terminal.css */ \"./css/terminal.css\");\n\nconst exec = __webpack_require__(/*! execon */ \"./node_modules/execon/lib/exec.js\");\n\nconst load = __webpack_require__(/*! load.js */ \"./node_modules/load.js/lib/load.js\");\n\nconst DOM = __webpack_require__(/*! ../dom */ \"./client/dom/index.js\");\n\nconst Images = __webpack_require__(/*! ../dom/images */ \"./client/dom/images.js\");\n\nconst {\n  Dialog\n} = DOM;\nconst {\n  Key,\n  config\n} = CloudCmd;\nCloudCmd.TerminalRun = exports;\nlet Loaded;\nlet Terminal;\nlet Socket;\nconst exitCodeStore = fullstore();\n\nconst loadAll = async () => {\n  const {\n    prefix\n  } = CloudCmd;\n  const prefixGritty = getPrefix();\n  const js = `${prefixGritty}/gritty.js`;\n  const css = `${prefix}/dist/terminal.css`;\n  const [e] = await tryToCatch(load.parallel, [js, css]);\n\n  if (e) {\n    const src = e.target.src.replace(window.location.href, '');\n    return Dialog.alert(`file ${src} could not be loaded`);\n  }\n\n  Loaded = true;\n};\n\nmodule.exports.init = async () => {\n  if (!config('terminal')) return;\n  Images.show.load('top');\n  await CloudCmd.View();\n  await loadAll();\n};\n\nmodule.exports.show = promisify(function () {\n  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};\n  let fn = arguments.length > 1 ? arguments[1] : undefined;\n  if (!Loaded) return fn(null, -1);\n  if (!config('terminal')) return;\n  create(options);\n  CloudCmd.View.show(Terminal.element, {\n    afterShow: () => {\n      Terminal.focus();\n    },\n    afterClose: () => {\n      fn(null, exitCodeStore());\n    }\n  });\n});\nmodule.exports.hide = hide;\n\nfunction hide() {\n  CloudCmd.View.hide();\n}\n\nfunction getPrefix() {\n  return CloudCmd.prefix + '/gritty';\n}\n\nfunction getPrefixSocket() {\n  return CloudCmd.prefixSocket + '/gritty';\n}\n\nfunction getEnv() {\n  return {\n    ACTIVE_DIR: DOM.getCurrentDirPath,\n    PASSIVE_DIR: DOM.getNotCurrentDirPath,\n    CURRENT_NAME: DOM.getCurrentName,\n    CURRENT_PATH: DOM.getCurrentPath\n  };\n}\n\nfunction create(createOptions) {\n  const {\n    cwd = DOM.getCurrentDirPath(),\n    command,\n    autoClose,\n    closeMessage = 'Press any key to close Terminal...'\n  } = createOptions;\n  const options = {\n    cwd,\n    env: getEnv(),\n    prefix: getPrefixSocket(),\n    socketPath: CloudCmd.prefix,\n    fontFamily: 'Droid Sans Mono',\n    command,\n    autoRestart: false\n  };\n  let commandExit = false;\n  const {\n    socket,\n    terminal\n  } = gritty(document.body, options);\n  Socket = socket;\n  Terminal = terminal;\n  Terminal.onKey(_ref => {\n    let {\n      domEvent\n    } = _ref;\n    const {\n      keyCode,\n      shiftKey\n    } = domEvent;\n    if (commandExit) hide();\n\n    if (shiftKey && keyCode === Key.ESC) {\n      hide();\n    }\n  });\n  Socket.on('exit', code => {\n    exitCodeStore(code);\n    if (autoClose) return hide();\n    terminal.write(`\\n${closeMessage}`);\n    commandExit = true;\n  });\n  Socket.on('connect', exec.with(authCheck, socket));\n}\n\nfunction authCheck(spawn) {\n  spawn.emit('auth', config('username'), config('password'));\n  spawn.on('reject', () => {\n    Dialog.alert('Wrong credentials!');\n  });\n}\n\n//# sourceURL=file://cloudcmd/client/modules/terminal-run.js");
 
 /***/ })
 

package/dist-dev/modules/user-menu.js

@@ -211,7 +211,7 @@ eval("\n\nconst isNumber = a => typeof a === 'number';\n\nmodule.exports = error
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n\nconst {\n  entries,\n  assign\n} = Object;\n\nmodule.exports = userMenu => {\n  const names = [];\n  const keys = {};\n  const items = {};\n  const settings = {};\n\n  for (const [str, fn] of entries(userMenu)) {\n    if (str === '__settings') {\n      assign(settings, userMenu[str]);\n      continue;\n    }\n\n    if (/^_/.test(str)) {\n      continue;\n    }\n\n    names.push(str);\n    const [key, name] = str.split(' - ');\n    keys[key] = fn;\n    items[name] = fn;\n  }\n\n  return {\n    names,\n    keys,\n    items,\n    settings\n  };\n};\n\n//# sourceURL=file://cloudcmd/client/modules/user-menu/parse-user-menu.js");
+eval("\n\nconst {\n  entries,\n  assign\n} = Object;\n\nmodule.exports = userMenu => {\n  const names = [];\n  const keys = {};\n  const items = {};\n  const settings = {};\n\n  for (const [str, fn] of entries(userMenu)) {\n    if (str === '__settings') {\n      assign(settings, userMenu[str]);\n      continue;\n    }\n\n    if (str.startsWith('_')) {\n      continue;\n    }\n\n    names.push(str);\n    const [key, name] = str.split(' - ');\n    keys[key] = fn;\n    items[name] = fn;\n  }\n\n  return {\n    names,\n    keys,\n    items,\n    settings\n  };\n};\n\n//# sourceURL=file://cloudcmd/client/modules/user-menu/parse-user-menu.js");
 
 /***/ }),
 

package/dist-dev/sw.js

@@ -101,7 +101,7 @@ var serviceWorkerOption = {
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n\nconst tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\n\nconst currify = __webpack_require__(/*! currify */ \"./node_modules/currify/lib/currify.js\");\n\nconst isDev = \"development\" === 'development';\n\nconst isGet = a => a.method === 'GET';\n\nconst isBasic = a => a.type === 'basic';\n\nconst wait = currify((f, e) => e.waitUntil(f()));\nconst respondWith = currify((f, e) => {\n  const {\n    request\n  } = e;\n  const {\n    url\n  } = request;\n  const pathname = getPathName(url);\n  if (/\\/$/.test(url) || /\\^\\/fs/.test(pathname)) return;\n  if (!isGet(request)) return;\n  if (!isBasic(request)) return;\n  if (/^\\/api/.test(pathname)) return;\n  if (/^socket.io/.test(pathname)) return;\n  e.respondWith(f(e));\n});\n\nconst getPathName = url => new URL(url).pathname;\n\nconst date = \"Sat Apr 23 2022 01:35:24 GMT+0300 (Eastern European Summer Time)\";\nconst NAME = `cloudcmd: ${date}`;\n\nconst createRequest = a => new Request(a, {\n  credentials: 'same-origin'\n});\n\nconst getRequest = (a, request) => {\n  if (a !== '/') return request;\n  return createRequest('/');\n};\n\nself.addEventListener('install', wait(onInstall));\nself.addEventListener('fetch', respondWith(onFetch));\nself.addEventListener('activate', wait(onActivate));\n\nasync function onActivate() {\n  console.info(`cloudcmd: sw: activate: ${NAME}`);\n  await self.clients.claim();\n  const keys = await caches.keys();\n  const deleteCache = caches.delete.bind(caches);\n  await Promise.all(keys.map(deleteCache));\n}\n\nasync function onInstall() {\n  console.info(`cloudcmd: sw: install: ${NAME}`);\n  await self.skipWaiting();\n}\n\nasync function onFetch(event) {\n  const {\n    request\n  } = event;\n  const {\n    url\n  } = request;\n  const pathname = getPathName(url);\n  const newRequest = getRequest(pathname, event.request);\n  const cache = await caches.open(NAME);\n  const response = await cache.match(request);\n  if (!isDev && response) return response;\n  const [e, resp] = await tryToCatch(fetch, newRequest, {\n    credentials: 'same-origin'\n  });\n  if (e) return new Response(e.message);\n  await addToCache(request, resp.clone());\n  return resp;\n}\n\nasync function addToCache(request, response) {\n  const cache = await caches.open(NAME);\n  return cache.put(request, response);\n}\n\n//# sourceURL=file://cloudcmd/client/sw/sw.js");
+eval("\n\nconst tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\n\nconst currify = __webpack_require__(/*! currify */ \"./node_modules/currify/lib/currify.js\");\n\nconst isDev = \"development\" === 'development';\n\nconst isGet = a => a.method === 'GET';\n\nconst isBasic = a => a.type === 'basic';\n\nconst wait = currify((f, e) => e.waitUntil(f()));\nconst respondWith = currify((f, e) => {\n  const {\n    request\n  } = e;\n  const {\n    url\n  } = request;\n  const pathname = getPathName(url);\n  if (url.endsWith('/') || /\\^\\/fs/.test(pathname)) return;\n  if (!isGet(request)) return;\n  if (!isBasic(request)) return;\n  if (pathname.startsWith('/api')) return;\n  if (/^socket.io/.test(pathname)) return;\n  e.respondWith(f(e));\n});\n\nconst getPathName = url => new URL(url).pathname;\n\nconst date = \"Fri Jul 01 2022 14:29:13 GMT+0300 (Eastern European Summer Time)\";\nconst NAME = `cloudcmd: ${date}`;\n\nconst createRequest = a => new Request(a, {\n  credentials: 'same-origin'\n});\n\nconst getRequest = (a, request) => {\n  if (a !== '/') return request;\n  return createRequest('/');\n};\n\nself.addEventListener('install', wait(onInstall));\nself.addEventListener('fetch', respondWith(onFetch));\nself.addEventListener('activate', wait(onActivate));\n\nasync function onActivate() {\n  console.info(`cloudcmd: sw: activate: ${NAME}`);\n  await self.clients.claim();\n  const keys = await caches.keys();\n  const deleteCache = caches.delete.bind(caches);\n  await Promise.all(keys.map(deleteCache));\n}\n\nasync function onInstall() {\n  console.info(`cloudcmd: sw: install: ${NAME}`);\n  await self.skipWaiting();\n}\n\nasync function onFetch(event) {\n  const {\n    request\n  } = event;\n  const {\n    url\n  } = request;\n  const pathname = getPathName(url);\n  const newRequest = getRequest(pathname, event.request);\n  const cache = await caches.open(NAME);\n  const response = await cache.match(request);\n  if (!isDev && response) return response;\n  const [e, resp] = await tryToCatch(fetch, newRequest, {\n    credentials: 'same-origin'\n  });\n  if (e) return new Response(e.message);\n  await addToCache(request, resp.clone());\n  return resp;\n}\n\nasync function addToCache(request, response) {\n  const cache = await caches.open(NAME);\n  return cache.put(request, response);\n}\n\n//# sourceURL=file://cloudcmd/client/sw/sw.js");
 
 /***/ }),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcmd",
-  "version": "16.1.0",
+  "version": "16.3.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "File manager for the web with console and editor",
@@ -96,7 +96,7 @@
     "deepmerge": "^4.0.0",
     "deepword": "^8.0.0",
     "dword": "^14.0.0",
-    "edward": "^13.0.0",
+    "edward": "^14.0.0",
     "es6-promisify": "^7.0.0",
     "execon": "^1.2.0",
     "express": "^4.13.0",
@@ -111,7 +111,7 @@
     "jju": "^1.3.0",
     "jonny": "^3.0.0",
     "just-snake-case": "^1.1.0",
-    "markdown-it": "^12.0.0",
+    "markdown-it": "^13.0.1",
     "mellow": "^3.0.0",
     "nomine": "^4.0.0",
     "object.omit": "^3.0.0",
@@ -121,7 +121,7 @@
     "package-json": "^7.0.0",
     "ponse": "^7.0.0",
     "pullout": "^4.0.0",
-    "putout": "^25.0.1",
+    "putout": "^26.0.1",
     "redzip": "^2.0.0",
     "rendy": "^3.0.0",
     "restafary": "^11.0.0",
@@ -132,7 +132,7 @@
     "socket.io-client": "^4.0.1",
     "squad": "^3.0.0",
     "table": "^6.0.1",
-    "thread-it": "^1.1.0",
+    "thread-it": "^2.0.0",
     "try-catch": "^3.0.0",
     "try-to-catch": "^3.0.0",
     "tryrequire": "^3.0.0",

package/server/cloudcmd.js

@@ -1,20 +1,19 @@
 'use strict';
 
 const DIR = __dirname + '/';
-const DIR_ROOT = DIR + '../';
 const DIR_COMMON = DIR + '../common/';
-
 const path = require('path');
-const fs = require('fs');
 
+const fs = require('fs');
 const cloudfunc = require(DIR_COMMON + 'cloudfunc');
+
 const authentication = require(DIR + 'auth');
 const {
     createConfig,
     configPath,
 } = require(DIR + 'config');
-
 const modulas = require(DIR + 'modulas');
+
 const userMenu = require(DIR + 'user-menu');
 const rest = require(DIR + 'rest');
 const route = require(DIR + 'route');
@@ -22,8 +21,8 @@ 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');
 const ponse = require('ponse');
 const restafary = require('restafary');
@@ -34,6 +33,7 @@ const dword = require('dword');
 const deepword = require('deepword');
 const nomine = require('nomine');
 const fileop = require('@cloudcmd/fileop');
+const DIR_ROOT = DIR + '../';
 
 const isDev = process.env.NODE_ENV === 'development';
 const getDist = (isDev) => isDev ? 'dist-dev' : 'dist';

package/server/config.js

@@ -2,17 +2,16 @@
 
 const DIR_SERVER = __dirname + '/';
 const DIR_COMMON = '../common/';
-const DIR = DIR_SERVER + '../';
-
 const path = require('path');
+
 const fs = require('fs');
 const Emitter = require('events');
 const {homedir} = require('os');
-
 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');
 const tryToCatch = require('try-to-catch');
 const pullout = require('pullout');
@@ -22,6 +21,7 @@ const jju = require('jju');
 const writejson = require('writejson');
 const tryCatch = require('try-catch');
 const criton = require('criton');
+const DIR = DIR_SERVER + '../';
 const HOME = homedir();
 
 const resolve = Promise.resolve.bind(Promise);

package/server/distribute/import.js

@@ -6,10 +6,10 @@ const squad = require('squad');
 const fullstore = require('fullstore');
 
 const io = require('socket.io-client');
-const forEachKey = currify(require('for-each-key'));
-
 const log = require('./log');
+
 const env = require('../env');
+const forEachKey = currify(require('for-each-key'));
 
 const {
     importStr,

package/server/markdown/index.js

@@ -8,10 +8,10 @@ const ponse = require('ponse');
 const threadIt = require('thread-it');
 const {read} = require('redzip');
 
-const parse = threadIt(join(__dirname, 'worker'));
-
 const root = require('../root');
 
+const parse = threadIt(join(__dirname, 'worker'));
+
 threadIt.init();
 
 // warm up

package/server/rest/index.js

@@ -87,7 +87,7 @@ function rest(config, request, response) {
  */
 function sendData(params, config, callback) {
     const p = params;
-    const isMD = /^\/markdown/.test(p.name);
+    const isMD = p.name.startsWith('/markdown');
     const rootDir = config('root');
     
     if (isMD)
@@ -122,7 +122,7 @@ function onGET(params, config, callback) {
     if (p.name[0] === '/')
         cmd = p.name.replace('/', '');
     
-    if (/^pack/.test(cmd)) {
+    if (cmd.startsWith('pack')) {
         cmd = cmd.replace(/^pack/, '');
         streamPack(root(cmd, rootDir), p.response, packer);
         return;

package/server/route.js

@@ -20,9 +20,11 @@ const root = require(DIR_SERVER + 'root');
 const prefixer = require(DIR_SERVER + 'prefixer');
 const CloudFunc = require(DIR_COMMON + 'cloudfunc');
 
-const getPrefix = (config) => prefixer(config('prefix'));
+const Columns = require(`${DIR_SERVER}/columns`);
 
-const onceRequire = once(require);
+const Template = require(`${DIR_SERVER}/template`);
+
+const {FS} = CloudFunc;
 
 const sendIndex = (params, data) => {
     const ponseParams = {
@@ -33,10 +35,8 @@ const sendIndex = (params, data) => {
     ponse.send(data, ponseParams);
 };
 
-const {FS} = CloudFunc;
-
-const Columns = require(`${DIR_SERVER}/columns`);
-const Template = require(`${DIR_SERVER}/template`);
+const onceRequire = once(require);
+const getPrefix = (config) => prefixer(config('prefix'));
 
 const getReadDir = (config) => {
     if (!config('dropbox'))

package/server/{server.js → server.mjs}

@@ -1,39 +1,36 @@
-'use strict';
+import cloudcmd from './cloudcmd.js';
 
-const DIR_SERVER = './';
-const cloudcmd = require(DIR_SERVER + 'cloudcmd');
+import http from 'http';
+import {promisify} from 'util';
+import currify from 'currify';
+import squad from 'squad';
+import tryToCatch from 'try-to-catch';
+import wraptile from 'wraptile';
+import compression from 'compression';
+import threadIt from 'thread-it';
 
-const http = require('http');
-const {promisify} = require('util');
-const currify = require('currify');
-const squad = require('squad');
-const tryToCatch = require('try-to-catch');
-const wraptile = require('wraptile');
-const compression = require('compression');
-const threadIt = require('thread-it');
+import exit from './exit.js';
+import opn from 'open';
 
-const two = currify((f, a, b) => f(a, b));
-const exit = require(DIR_SERVER + 'exit');
+import express from 'express';
+import {Server} from 'socket.io';
+import tryRequire from 'tryrequire';
 
-const exitPort = two(exit, 'cloudcmd --port: %s');
 const bind = (f, self) => f.bind(self);
-const promisifySelf = squad(promisify, bind);
 
+const two = currify((f, a, b) => f(a, b));
 const shutdown = wraptile(async (promises) => {
     console.log('closing cloudcmd...');
     await Promise.all(promises);
     threadIt.terminate();
     process.exit(0);
 });
+const promisifySelf = squad(promisify, bind);
 
-const opn = require('open');
-const express = require('express');
-const io = require('socket.io');
-
-const tryRequire = require('tryrequire');
+const exitPort = two(exit, 'cloudcmd --port: %s');
 const logger = tryRequire('morgan');
 
-module.exports = async (options, config) => {
+export default async (options, config) => {
     const prefix = config('prefix');
     const port = process.env.PORT /* c9           */
                  || config('port');
@@ -51,7 +48,7 @@ module.exports = async (options, config) => {
     if (prefix)
         app.get('/', (req, res) => res.redirect(prefix + '/'));
     
-    const socketServer = io(server, {
+    const socketServer = new Server(server, {
         path: `${prefix}/socket.io`,
     });
     

package/tmpl/config.hbs

@@ -34,7 +34,7 @@
             Diff
         </label>
     </li>
-    <li title="Pack text data transfered by an Editor">
+    <li title="Pack text data transferred by an Editor">
         <label>
             <input
                 data-name="js-zip"
@@ -43,7 +43,7 @@
             Zip
          </label>
     </li>
-    <li title="Visible Collumns">
+    <li title="Visible Columns">
         <select data-name="js-columns" class="form-control full-width" title="Visible Columns">
             <option {{ name-size-date-owner-mode-selected }}>name-size-date-owner-mode</option>
             <option {{ name-size-date-selected }}>name-size-date</option>