cloudcmd 16.0.1 → 16.2.0

package/dist-dev/modules/operation.js

@@ -187,7 +187,7 @@ eval("\n\nconst currify = __webpack_require__(/*! currify */ \"./node_modules/cu
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("/* global CloudCmd */\n\n/* global Util */\n\n/* global DOM */\n\n/* global fileop */\n\n\nconst currify = __webpack_require__(/*! currify */ \"./node_modules/currify/lib/currify.js\");\n\nconst wraptile = __webpack_require__(/*! wraptile */ \"./node_modules/wraptile/lib/wraptile.js\");\n\nconst {\n  promisify\n} = __webpack_require__(/*! es6-promisify */ \"./node_modules/es6-promisify/dist/promisify.mjs\");\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 tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\n\nconst {\n  encode\n} = __webpack_require__(/*! ../../../common/entity */ \"./common/entity.js\");\n\nconst removeExtension = __webpack_require__(/*! ./remove-extension */ \"./client/modules/operation/remove-extension.js\");\n\nconst setListeners = __webpack_require__(/*! ./set-listeners */ \"./client/modules/operation/set-listeners.js\");\n\nconst getNextCurrentName = __webpack_require__(/*! ./get-next-current-name */ \"./client/modules/operation/get-next-current-name.js\");\n\nconst removeQuery = a => a.replace(/\\?.*/, '');\n\nconst Name = 'Operation';\nCloudCmd[Name] = exports;\nconst {\n  config\n} = CloudCmd;\nconst {\n  Dialog,\n  Images\n} = DOM;\nconst authCheck = wraptile(_authCheck);\nconst Operation = {};\nlet Loaded;\nlet copyFn;\nlet moveFn;\nlet deleteFn;\nlet extractFn;\nlet packZipFn;\nlet packTarFn;\nconst Info = DOM.CurrentInfo;\nconst showLoad = Images.show.load.bind(null, 'top');\nconst processFiles = currify(_processFiles);\n\nconst noFilesCheck = () => {\n  const {\n    length\n  } = DOM.getActiveFiles();\n  const is = Boolean(!length);\n  if (is) return Dialog.alert.noFiles();\n  return is;\n};\n\nmodule.exports.init = promisify(callback => {\n  showLoad();\n  exec.series([DOM.loadSocket, async callback => {\n    if (config('dropbox')) return callback();\n    const {\n      prefix,\n      prefixSocket\n    } = CloudCmd;\n    await loadAll();\n    await initOperations(prefix, prefixSocket, callback);\n  }, callback => {\n    Loaded = true;\n    Images.hide();\n    callback();\n  }], callback);\n});\n\nfunction _authCheck(spawn, ok) {\n  const accept = wraptile(ok);\n  const alertDialog = wraptile(Dialog.alert);\n  spawn.on('accept', accept(spawn));\n  spawn.on('reject', alertDialog('Wrong credentials!'));\n  spawn.emit('auth', config('username'), config('password'));\n}\n\nconst onConnect = currify((fn, operator) => {\n  setOperations(operator);\n  fn();\n});\n\nasync function initOperations(prefix, socketPrefix, fn) {\n  socketPrefix = `${socketPrefix}/fileop`;\n  const operator = await fileop({\n    prefix,\n    socketPrefix\n  });\n  operator.on('connect', authCheck(operator, onConnect(fn)));\n}\n\nfunction setOperations(operator) {\n  packTarFn = (_ref, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref;\n    const operation = 'Tar';\n    const listen = setListeners({\n      operation,\n      callback,\n      noContinue: true,\n      from,\n      to\n    });\n    operator.tar(from, to, names).then(listen);\n  };\n\n  packZipFn = (_ref2, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref2;\n    const operation = 'Zip';\n    const listen = setListeners({\n      operation,\n      callback,\n      noContinue: true,\n      from,\n      to\n    });\n    operator.zip(from, to, names).then(listen);\n  };\n\n  deleteFn = (from, files, callback) => {\n    from = removeQuery(from);\n    const operation = 'Delete';\n    const listen = setListeners({\n      operation,\n      callback,\n      from\n    });\n    operator.remove(from, files).then(listen);\n  };\n\n  copyFn = (_ref3, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref3;\n    const operation = 'Copy';\n    const listen = setListeners({\n      operation,\n      callback,\n      from,\n      to,\n      names\n    });\n    operator.copy(from, to, names).then(listen);\n  };\n\n  moveFn = (_ref4, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref4;\n    const operation = 'Move';\n    const listen = setListeners({\n      operation,\n      callback,\n      from,\n      to\n    });\n    operator.move(from, to, names).then(listen);\n  };\n\n  extractFn = (_ref5, callback) => {\n    let {\n      from,\n      to\n    } = _ref5;\n    const operation = 'Extract';\n    const listen = setListeners({\n      operation,\n      callback,\n      noContinue: true,\n      from,\n      to\n    });\n    operator.extract(from, to).then(listen);\n  };\n}\n\nfunction getPacker(type) {\n  if (type === 'zip') return packZipFn;\n  return packTarFn;\n}\n\nmodule.exports.hide = () => {\n  CloudCmd.View.hide();\n};\n\nmodule.exports.show = (operation, data) => {\n  if (!Loaded) return;\n  if (operation === 'copy') return Operation.copy(data);\n  if (operation === 'move') return Operation.move(data);\n  if (operation === 'delete') return Operation.delete();\n  if (operation === 'delete:silent') return Operation.deleteSilent();\n  if (operation === 'pack') return Operation.pack();\n  if (operation === 'extract') return Operation.extract();\n};\n\nOperation.copy = processFiles({\n  type: 'copy'\n});\nOperation.move = processFiles({\n  type: 'move'\n});\nOperation.delete = promptDelete;\nOperation.deleteSilent = deleteSilent;\n\nOperation.pack = () => {\n  const isZip = config('packer') === 'zip';\n  twopack('pack', isZip ? 'zip' : 'tar');\n};\n\nOperation.extract = () => {\n  twopack('extract');\n};\n/**\n * prompt and delete current file or selected files\n *\n * @currentFile\n */\n\n\nasync function promptDelete() {\n  if (noFilesCheck()) return;\n  const msgAsk = 'Do you really want to delete the ';\n  const msgSel = 'selected ';\n  const files = DOM.getActiveFiles();\n  const names = DOM.getFilenames(files);\n  const n = names.length;\n  let msg;\n\n  if (n) {\n    let name = '';\n\n    for (let i = 0; i < 5 && i < n; i++) name += '\\n' + names[i];\n\n    if (n >= 5) name += '\\n...';\n    msg = msgAsk + msgSel + n + ' files/directories?\\n' + encode(name);\n  } else {\n    const current = DOM.getCurrentFile();\n    const isDir = DOM.isCurrentIsDir(current);\n\n    const getType = isDir => isDir ? 'directory' : 'file';\n\n    const type = getType(isDir) + ' ';\n    const name = DOM.getCurrentName(current);\n    msg = msgAsk + msgSel + type + name + '?';\n  }\n\n  const [cancel] = await Dialog.confirm(msg);\n  if (cancel) return;\n  deleteSilent(files);\n}\n/**\n * delete current or selected files\n *\n * @files\n */\n\n\nfunction deleteSilent() {\n  let files = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DOM.getActiveFiles();\n  const query = '?files';\n  const path = Info.dirPath;\n  if (noFilesCheck()) return;\n  showLoad();\n  const removedNames = DOM.getFilenames(files);\n  const names = DOM.CurrentInfo.files.map(DOM.getCurrentName);\n  const currentName = DOM.getCurrentName();\n  const nextCurrentName = getNextCurrentName(currentName, names, removedNames);\n  deleteFn(path + query, removedNames, async () => {\n    await CloudCmd.refresh();\n    const names = Info.files.map(DOM.getCurrentName);\n    const isCurrent = names.includes(currentName);\n    const name = isCurrent ? currentName : nextCurrentName;\n    DOM.setCurrentByName(name);\n  });\n}\n/*\n * process files (copy or move)\n * @param data\n * @param operation\n */\n\n\nasync function _processFiles(options, data) {\n  let selFiles;\n  let files;\n  let panel;\n  let shouldAsk;\n  let ok;\n  let from = '';\n  let to = '';\n  let names = [];\n  /* eslint no-multi-spaces: 0 */\n\n  if (data) {\n    from = data.from;\n    to = data.to;\n    names = data.names;\n    panel = Info.panel;\n  } else {\n    from = Info.dirPath;\n    to = DOM.getNotCurrentDirPath();\n    selFiles = DOM.getSelectedFiles();\n    names = DOM.getFilenames(selFiles);\n    data = {};\n    shouldAsk = true;\n    panel = Info.panelPassive;\n  }\n\n  if (!names.length) names.push(DOM.getCurrentName());\n  const [name] = names;\n  const sameName = DOM.getCurrentByName(name, panel);\n  if (!data && noFilesCheck()) return;\n  const {\n    type\n  } = options;\n  const isCopy = type === 'copy';\n  const option = isCopy ? 'confirmCopy' : 'confirmMove';\n  const title = isCopy ? 'Copy' : 'Rename/Move';\n  const operation = isCopy ? copyFn : moveFn;\n\n  if (shouldAsk && config(option)) {\n    const [cancel, newTo] = await prompt(title, to, names.map(encode));\n    if (!cancel) ask(newTo);\n    return;\n  }\n\n  ask(to);\n\n  function ask(to) {\n    ok = from !== to && to;\n    if (ok && !shouldAsk || !sameName) return go();\n    const str = `\"${name}\" already exist. Overwrite?`;\n    const cancel = false;\n    Dialog.confirm(str, {\n      cancel\n    }).then(go);\n\n    function go() {\n      showLoad();\n      files = {\n        from,\n        to,\n        names\n      };\n      operation(files, async () => {\n        await DOM.Storage.remove(from);\n        const {\n          panel,\n          panelPassive\n        } = Info;\n\n        const setCurrent = () => {\n          const currentName = name || data.names[0];\n          DOM.setCurrentByName(currentName);\n        };\n\n        if (!Info.isOnePanel) CloudCmd.refresh({\n          panel: panelPassive,\n          noCurrent: true\n        });\n        CloudCmd.refresh({\n          panel\n        }, setCurrent);\n      });\n    }\n  }\n}\n\nfunction checkEmpty(name, operation) {\n  if (!operation) throw Error(name + ' could not be empty!');\n}\n\nfunction twopack(operation, type) {\n  let op;\n  let fileFrom;\n  let currentName = Info.name;\n  const {\n    path,\n    dirPath\n  } = Info;\n  const activeFiles = DOM.getActiveFiles();\n  const names = DOM.getFilenames(activeFiles);\n  checkEmpty('operation', operation);\n  if (!names.length) return Dialog.alert.noFiles();\n\n  switch (operation) {\n    case 'extract':\n      op = extractFn;\n      fileFrom = {\n        from: path,\n        to: dirPath\n      };\n      currentName = removeExtension(currentName);\n      break;\n\n    case 'pack':\n      op = getPacker(type);\n      if (names.length > 1) currentName = Info.dir;\n      currentName += DOM.getPackerExt(type);\n      fileFrom = {\n        from: dirPath,\n        to: dirPath + currentName,\n        names\n      };\n      break;\n  }\n\n  showLoad();\n  op(fileFrom, error => {\n    !error && CloudCmd.refresh({\n      currentName\n    });\n  });\n}\n\nasync function prompt(msg, to, names) {\n  const n = names.length;\n  const [name] = names;\n  msg += ' ';\n  if (names.length > 1) msg += n + ' file(s)';else msg += '\"' + name + '\"';\n  msg += ' to';\n  return await Dialog.prompt(msg, to);\n}\n\nasync function loadAll() {\n  const {\n    prefix\n  } = CloudCmd;\n  const file = `${prefix}/fileop/fileop.js`;\n  const [error] = await tryToCatch(load.js, file);\n  if (error) Dialog.alert(error.message);\n  Loaded = true;\n}\n\n//# sourceURL=file://cloudcmd/client/modules/operation/index.js");
+eval("/* global CloudCmd */\n\n/* global Util */\n\n/* global DOM */\n\n/* global fileop */\n\n\nconst currify = __webpack_require__(/*! currify */ \"./node_modules/currify/lib/currify.js\");\n\nconst wraptile = __webpack_require__(/*! wraptile */ \"./node_modules/wraptile/lib/wraptile.js\");\n\nconst {\n  promisify\n} = __webpack_require__(/*! es6-promisify */ \"./node_modules/es6-promisify/dist/promisify.mjs\");\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 tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\n\nconst {\n  encode\n} = __webpack_require__(/*! ../../../common/entity */ \"./common/entity.js\");\n\nconst removeExtension = __webpack_require__(/*! ./remove-extension */ \"./client/modules/operation/remove-extension.js\");\n\nconst setListeners = __webpack_require__(/*! ./set-listeners */ \"./client/modules/operation/set-listeners.js\");\n\nconst getNextCurrentName = __webpack_require__(/*! ./get-next-current-name */ \"./client/modules/operation/get-next-current-name.js\");\n\nconst removeQuery = a => a.replace(/\\?.*/, '');\n\nconst Name = 'Operation';\nCloudCmd[Name] = exports;\nconst {\n  config\n} = CloudCmd;\nconst {\n  Dialog,\n  Images\n} = DOM;\nconst authCheck = wraptile(_authCheck);\nconst Operation = {};\nlet Loaded;\nlet copyFn;\nlet moveFn;\nlet deleteFn;\nlet extractFn;\nlet packZipFn;\nlet packTarFn;\nconst Info = DOM.CurrentInfo;\nconst showLoad = Images.show.load.bind(null, 'top');\nconst processFiles = currify(_processFiles);\n\nconst noFilesCheck = () => {\n  const {\n    length\n  } = DOM.getActiveFiles();\n  const is = Boolean(!length);\n  if (is) return Dialog.alert.noFiles();\n  return is;\n};\n\nmodule.exports.init = promisify(callback => {\n  showLoad();\n  exec.series([DOM.loadSocket, async callback => {\n    if (config('dropbox')) return callback();\n    const {\n      prefix,\n      prefixSocket\n    } = CloudCmd;\n    await loadAll();\n    await initOperations(prefix, prefixSocket, callback);\n  }, callback => {\n    Loaded = true;\n    Images.hide();\n    callback();\n  }], callback);\n});\n\nfunction _authCheck(spawn, ok) {\n  const accept = wraptile(ok);\n  const alertDialog = wraptile(Dialog.alert);\n  spawn.on('accept', accept(spawn));\n  spawn.on('reject', alertDialog('Wrong credentials!'));\n  spawn.emit('auth', config('username'), config('password'));\n}\n\nconst onConnect = currify((fn, operator) => {\n  setOperations(operator);\n  fn();\n});\n\nasync function initOperations(prefix, socketPrefix, fn) {\n  socketPrefix = `${socketPrefix}/fileop`;\n  const operator = await fileop({\n    prefix,\n    socketPrefix\n  });\n  operator.on('connect', authCheck(operator, onConnect(fn)));\n}\n\nfunction setOperations(operator) {\n  packTarFn = (_ref, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref;\n    const operation = 'Tar';\n    const listen = setListeners({\n      operation,\n      callback,\n      noContinue: true,\n      from,\n      to\n    });\n    operator.tar(from, to, names).then(listen);\n  };\n\n  packZipFn = (_ref2, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref2;\n    const operation = 'Zip';\n    const listen = setListeners({\n      operation,\n      callback,\n      noContinue: true,\n      from,\n      to\n    });\n    operator.zip(from, to, names).then(listen);\n  };\n\n  deleteFn = (from, files, callback) => {\n    from = removeQuery(from);\n    const operation = 'Delete';\n    const listen = setListeners({\n      operation,\n      callback,\n      from\n    });\n    operator.remove(from, files).then(listen);\n  };\n\n  copyFn = (_ref3, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref3;\n    const operation = 'Copy';\n    const listen = setListeners({\n      operation,\n      callback,\n      from,\n      to,\n      names\n    });\n    operator.copy(from, to, names).then(listen);\n  };\n\n  moveFn = (_ref4, callback) => {\n    let {\n      from,\n      to,\n      names\n    } = _ref4;\n    const operation = 'Move';\n    const listen = setListeners({\n      operation,\n      callback,\n      from,\n      to\n    });\n    operator.move(from, to, names).then(listen);\n  };\n\n  extractFn = (_ref5, callback) => {\n    let {\n      from,\n      to\n    } = _ref5;\n    const operation = 'Extract';\n    const listen = setListeners({\n      operation,\n      callback,\n      noContinue: true,\n      from,\n      to\n    });\n    operator.extract(from, to).then(listen);\n  };\n}\n\nfunction getPacker(type) {\n  if (type === 'zip') return packZipFn;\n  return packTarFn;\n}\n\nmodule.exports.hide = () => {\n  CloudCmd.View.hide();\n};\n\nmodule.exports.show = (operation, data) => {\n  if (!Loaded) return;\n  if (operation === 'copy') return Operation.copy(data);\n  if (operation === 'move') return Operation.move(data);\n  if (operation === 'delete') return Operation.delete();\n  if (operation === 'delete:silent') return Operation.deleteSilent();\n  if (operation === 'pack') return Operation.pack();\n  if (operation === 'extract') return Operation.extract();\n};\n\nOperation.copy = processFiles({\n  type: 'copy'\n});\nOperation.move = processFiles({\n  type: 'move'\n});\nOperation.delete = promptDelete;\nOperation.deleteSilent = deleteSilent;\n\nOperation.pack = () => {\n  const isZip = config('packer') === 'zip';\n  twopack('pack', isZip ? 'zip' : 'tar');\n};\n\nOperation.extract = () => {\n  twopack('extract');\n};\n/**\n * prompt and delete current file or selected files\n *\n * @currentFile\n */\n\n\nasync function promptDelete() {\n  if (noFilesCheck()) return;\n  const msgAsk = 'Do you really want to delete the ';\n  const msgSel = 'selected ';\n  const files = DOM.getActiveFiles();\n  const names = DOM.getFilenames(files);\n  const n = names.length;\n  let msg;\n\n  if (n) {\n    let name = '';\n\n    for (let i = 0; i < 5 && i < n; i++) name += '\\n' + names[i];\n\n    if (n >= 5) name += '\\n...';\n    msg = msgAsk + msgSel + n + ' files/directories?\\n' + encode(name);\n  } else {\n    const current = DOM.getCurrentFile();\n    const isDir = DOM.isCurrentIsDir(current);\n\n    const getType = isDir => isDir ? 'directory' : 'file';\n\n    const type = getType(isDir) + ' ';\n    const name = DOM.getCurrentName(current);\n    msg = msgAsk + msgSel + type + name + '?';\n  }\n\n  const [cancel] = await Dialog.confirm(msg);\n  if (cancel) return;\n  deleteSilent(files);\n}\n/**\n * delete current or selected files\n *\n * @files\n */\n\n\nfunction deleteSilent() {\n  let files = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DOM.getActiveFiles();\n  const query = '?files';\n  const path = Info.dirPath;\n  if (noFilesCheck()) return;\n  showLoad();\n  const removedNames = DOM.getFilenames(files);\n  const names = DOM.CurrentInfo.files.map(DOM.getCurrentName);\n  const currentName = DOM.getCurrentName();\n  const nextCurrentName = getNextCurrentName(currentName, names, removedNames);\n  deleteFn(path + query, removedNames, async () => {\n    await CloudCmd.refresh();\n    const names = Info.files.map(DOM.getCurrentName);\n    const isCurrent = names.includes(currentName);\n    const name = isCurrent ? currentName : nextCurrentName;\n    DOM.setCurrentByName(name);\n  });\n}\n/*\n * process files (copy or move)\n * @param data\n * @param operation\n */\n\n\nasync function _processFiles(options, data) {\n  let selFiles;\n  let files;\n  let panel;\n  let shouldAsk;\n  let ok;\n  let from = '';\n  let to = '';\n  let names = [];\n  /* eslint no-multi-spaces: 0 */\n\n  if (data) {\n    from = data.from;\n    to = data.to;\n    names = data.names;\n    panel = Info.panel;\n  } else {\n    from = Info.dirPath;\n    to = DOM.getNotCurrentDirPath();\n    selFiles = DOM.getSelectedFiles();\n    names = DOM.getFilenames(selFiles);\n    data = {};\n    shouldAsk = true;\n    panel = Info.panelPassive;\n  }\n\n  if (!names.length) names.push(DOM.getCurrentName());\n  const [name] = names;\n  const sameName = DOM.getCurrentByName(name, panel);\n  if (!data && noFilesCheck()) return;\n  const {\n    type\n  } = options;\n  const isCopy = type === 'copy';\n  const option = isCopy ? 'confirmCopy' : 'confirmMove';\n  const title = isCopy ? 'Copy' : 'Rename/Move';\n  const operation = isCopy ? copyFn : moveFn;\n\n  if (shouldAsk && config(option)) {\n    const [cancel, newTo] = await prompt(title, to, names.map(encode));\n    if (!cancel) ask(newTo);\n    return;\n  }\n\n  ask(to);\n\n  function ask(to) {\n    ok = from !== to && to;\n    if (ok && !shouldAsk || !sameName) return go();\n    const str = `\"${name}\" already exist. Overwrite?`;\n    const cancel = false;\n    Dialog.confirm(str, {\n      cancel\n    }).then(go);\n\n    function go() {\n      showLoad();\n      files = {\n        from,\n        to,\n        names\n      };\n      operation(files, async () => {\n        await DOM.Storage.remove(from);\n        const {\n          panel,\n          panelPassive\n        } = Info;\n        if (!Info.isOnePanel) CloudCmd.refresh({\n          panel: panelPassive,\n          noCurrent: true\n        });\n        CloudCmd.refresh({\n          panel\n        });\n      });\n    }\n  }\n}\n\nfunction checkEmpty(name, operation) {\n  if (!operation) throw Error(name + ' could not be empty!');\n}\n\nfunction twopack(operation, type) {\n  let op;\n  let fileFrom;\n  let currentName = Info.name;\n  const {\n    path,\n    dirPath\n  } = Info;\n  const activeFiles = DOM.getActiveFiles();\n  const names = DOM.getFilenames(activeFiles);\n  checkEmpty('operation', operation);\n  if (!names.length) return Dialog.alert.noFiles();\n\n  switch (operation) {\n    case 'extract':\n      op = extractFn;\n      fileFrom = {\n        from: path,\n        to: dirPath\n      };\n      currentName = removeExtension(currentName);\n      break;\n\n    case 'pack':\n      op = getPacker(type);\n      if (names.length > 1) currentName = Info.dir;\n      currentName += DOM.getPackerExt(type);\n      fileFrom = {\n        from: dirPath,\n        to: dirPath + currentName,\n        names\n      };\n      break;\n  }\n\n  showLoad();\n  op(fileFrom, error => {\n    !error && CloudCmd.refresh({\n      currentName\n    });\n  });\n}\n\nasync function prompt(msg, to, names) {\n  const n = names.length;\n  const [name] = names;\n  msg += ' ';\n  if (names.length > 1) msg += n + ' file(s)';else msg += '\"' + name + '\"';\n  msg += ' to';\n  return await Dialog.prompt(msg, to);\n}\n\nasync function loadAll() {\n  const {\n    prefix\n  } = CloudCmd;\n  const file = `${prefix}/fileop/fileop.js`;\n  const [error] = await tryToCatch(load.js, file);\n  if (error) Dialog.alert(error.message);\n  Loaded = true;\n}\n\n//# sourceURL=file://cloudcmd/client/modules/operation/index.js");
 
 /***/ }),
 
@@ -211,7 +211,7 @@ eval("\n\nconst {\n  getExt\n} = __webpack_require__(/*! ../../../common/util */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n/* global DOM */\n\nconst {\n  Dialog,\n  Images\n} = DOM;\n\nconst forEachKey = __webpack_require__(/*! for-each-key */ \"./node_modules/for-each-key/lib/for-each-key.js\");\n\nconst wraptile = __webpack_require__(/*! wraptile */ \"./node_modules/wraptile/lib/wraptile.js\");\n\nconst format = __webpack_require__(/*! ./format */ \"./client/modules/operation/format.js\");\n\nmodule.exports = options => emitter => {\n  const {\n    operation,\n    callback,\n    noContinue,\n    from,\n    to\n  } = options;\n  let done;\n  let lastError;\n  const onAbort = wraptile(_ref => {\n    let {\n      emitter,\n      operation\n    } = _ref;\n    emitter.abort();\n    const msg = `${operation} aborted`;\n    lastError = true;\n    Dialog.alert(msg, {\n      cancel: false\n    });\n  });\n  const removeListener = emitter.removeListener.bind(emitter);\n  const on = emitter.on.bind(emitter);\n  const message = format(operation, from, to);\n  const progress = Dialog.progress(message);\n  progress.catch(onAbort({\n    emitter,\n    operation\n  }));\n  const listeners = {\n    progress: value => {\n      done = value === 100;\n      progress.setProgress(value);\n    },\n    end: () => {\n      Images.hide();\n      forEachKey(removeListener, listeners);\n      progress.remove();\n      if (lastError || done) callback();\n    },\n    error: async error => {\n      lastError = error;\n\n      if (noContinue) {\n        listeners.end(error);\n        Dialog.alert(error);\n        progress.remove();\n        return;\n      }\n\n      const [cancel] = await Dialog.confirm(error + '\\n Continue?');\n      if (!done && !cancel) return emitter.continue();\n      emitter.abort();\n      progress.remove();\n    }\n  };\n  forEachKey(on, listeners);\n};\n\n//# sourceURL=file://cloudcmd/client/modules/operation/set-listeners.js");
+eval("\n/* global DOM */\n\nconst forEachKey = __webpack_require__(/*! for-each-key */ \"./node_modules/for-each-key/lib/for-each-key.js\");\n\nconst wraptile = __webpack_require__(/*! wraptile */ \"./node_modules/wraptile/lib/wraptile.js\");\n\nconst format = __webpack_require__(/*! ./format */ \"./client/modules/operation/format.js\");\n\nconst {\n  Dialog,\n  Images\n} = DOM;\n\nmodule.exports = options => emitter => {\n  const {\n    operation,\n    callback,\n    noContinue,\n    from,\n    to\n  } = options;\n  let done;\n  let lastError;\n  const onAbort = wraptile(_ref => {\n    let {\n      emitter,\n      operation\n    } = _ref;\n    emitter.abort();\n    const msg = `${operation} aborted`;\n    lastError = true;\n    Dialog.alert(msg, {\n      cancel: false\n    });\n  });\n  const removeListener = emitter.removeListener.bind(emitter);\n  const on = emitter.on.bind(emitter);\n  const message = format(operation, from, to);\n  const progress = Dialog.progress(message);\n  progress.catch(onAbort({\n    emitter,\n    operation\n  }));\n  const listeners = {\n    progress: value => {\n      done = value === 100;\n      progress.setProgress(value);\n    },\n    end: () => {\n      Images.hide();\n      forEachKey(removeListener, listeners);\n      progress.remove();\n      if (lastError || done) callback();\n    },\n    error: async error => {\n      lastError = error;\n\n      if (noContinue) {\n        listeners.end(error);\n        Dialog.alert(error);\n        progress.remove();\n        return;\n      }\n\n      const [cancel] = await Dialog.confirm(error + '\\n Continue?');\n      if (!done && !cancel) return emitter.continue();\n      emitter.abort();\n      progress.remove();\n    }\n  };\n  forEachKey(on, listeners);\n};\n\n//# sourceURL=file://cloudcmd/client/modules/operation/set-listeners.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 = \"Fri Apr 22 2022 14:42:54 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 Jun 17 2022 16:49:49 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.0.1",
+  "version": "16.2.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",
@@ -119,9 +119,9 @@
     "onezip": "^5.0.0",
     "open": "^8.0.5",
     "package-json": "^7.0.0",
-    "ponse": "^6.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>