cloudcmd 17.3.0 → 17.3.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.03.29, v17.3.2
+
+fix:
+- f7a6a366 typo: Wraped -> Wrapped
+
+2024.03.29, v17.3.1
+
+feature:
+- d7581829 distribute: convert to ESM
+
 2024.03.29, v17.3.0
 
 feature:

package/HELP.md

@@ -1,4 +1,4 @@
-# Cloud Commander v17.3.0
+# Cloud Commander v17.3.2
 
 ### [Main][MainURL] [Blog][BlogURL] [Support][SupportURL] [Demo][DemoURL]
 
@@ -93,7 +93,8 @@ Cloud Commander supports the following command-line parameters:
 | `--terminal-command`          | set command to run in terminal (shell by default)
 | `--terminal-auto-restart`     | restart command on exit
 | `--vim`                       | enable vim hot keys
-| `--themes`                   | set visible themes
+| `--columns`                   | set visible columns
+| `--theme`                     | set theme 'light' or 'dark'"
 | `--export`                    | enable export of config through a server
 | `--export-token`              | authorization token used by export server
 | `--import`                    | enable import of config
@@ -429,6 +430,7 @@ Some config options can be overridden with environment variables, such as:
 - `CLOUDCMD_OPEN` - open web browser when server started
 - `CLOUDCMD_EDITOR` - set editor
 - `CLOUDCMD_COLUMNS` - set visible themes
+- `CLOUDCMD_THEME` - set themes "light" or "dark"
 - `CLOUDCMD_CONTACT` - enable contact
 - `CLOUDCMD_CONFIG_DIALOG` - enable config dialog
 - `CLOUDCMD_CONFIG_AUTH` - enable auth change in config dialog
@@ -1093,6 +1095,8 @@ There are a lot of ways to be involved in `Cloud Commander` development:
 
 ## Version history
 
+- *2024.03.29*, **[v17.3.2](//github.com/coderaiser/cloudcmd/releases/tag/v17.3.2)**
+- *2024.03.29*, **[v17.3.1](//github.com/coderaiser/cloudcmd/releases/tag/v17.3.1)**
 - *2024.03.29*, **[v17.3.0](//github.com/coderaiser/cloudcmd/releases/tag/v17.3.0)**
 - *2024.03.29*, **[v17.2.1](//github.com/coderaiser/cloudcmd/releases/tag/v17.2.1)**
 - *2024.03.22*, **[v17.2.0](//github.com/coderaiser/cloudcmd/releases/tag/v17.2.0)**
@@ -1546,7 +1550,7 @@ There are a lot of ways to be involved in `Cloud Commander` development:
 
 ## Special Thanks
 
-- [Olena Zalitok](http://www.linkedin.com/in/olena-zalitok-ux-designer "Olena Zalitok") for **logo** and **favicon**.
+- [Olena Zalitok](https://www.linkedin.com/in/ozalitok-ux-ui/ "Olena Zalitok") for **logo** and **favicon**.
 - [TarZak](https://github.com/tarzak "TarZak")
   - Russian and Ukrainian translations;
   - config template and style;

package/README.md

@@ -1,4 +1,4 @@
-# Cloud Commander v17.3.0 [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Codacy][CodacyIMG]][CodacyURL] [![Gitter][GitterIMGURL]][GitterURL]
+# Cloud Commander v17.3.2 [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Codacy][CodacyIMG]][CodacyURL] [![Gitter][GitterIMGURL]][GitterURL]
 
 ### [Main][MainURL] [Blog][BlogURL] [Support][SupportURL] [Demo][DemoURL]
 

package/bin/cloudcmd.mjs

@@ -241,8 +241,8 @@ async function main() {
     if (args.showConfig)
         await showConfig();
     
-    const distribute = await simport('../server/distribute/index.js');
-    const importConfig = promisify(distribute.import);
+    const {distributeImport} = await simport('../server/distribute/import.mjs');
+    const importConfig = promisify(distributeImport);
     
     await start(options, config);
     

package/dist/sw.js

@@ -7,5 +7,5 @@ var serviceWorkerOption = {
   ]
 };
         
-        !function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="/dist/",n(n.s=0)}([function(t,e,n){"use strict";const r=n(1),o=n(2),i=n(3),u="development"===r.env.NODE_ENV,c=i((t,e)=>e.waitUntil(t())),s=i((t,e)=>{const{request:n}=e,{url:r}=n,o=a(r);r.endsWith("/")||/\^\/fs/.test(o)||"GET"===n.method&&(t=>"basic"===t.type)(n)&&(o.startsWith("/api")||/^socket.io/.test(o)||e.respondWith(t(e)))}),a=t=>new URL(t).pathname,f="cloudcmd: Fri Mar 29 2024 13:28:34 GMT+0200 (Eastern European Standard Time)",l=(t,e)=>"/"!==t?e:(t=>new Request(t,{credentials:"same-origin"}))("/");self.addEventListener("install",c((async function(){console.info("cloudcmd: sw: install: "+f),await self.skipWaiting()}))),self.addEventListener("fetch",s((async function(t){const{request:e}=t,{url:n}=e,r=a(n),i=l(r,t.request),c=await caches.open(f),s=await c.match(e);if(!u&&s)return s;const[d,h]=await o(fetch,i,{credentials:"same-origin"});return d?new Response(d.message):(await async function(t,e){return(await caches.open(f)).put(t,e)}(e,h.clone()),h)}))),self.addEventListener("activate",c((async function(){console.info("cloudcmd: sw: activate: "+f),await self.clients.claim();const t=await caches.keys(),e=caches.delete.bind(caches);await Promise.all(t.map(e))})))},function(t,e){var n,r,o=t.exports={};function i(){throw new Error("setTimeout has not been defined")}function u(){throw new Error("clearTimeout has not been defined")}function c(t){if(n===setTimeout)return setTimeout(t,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(t,0);try{return n(t,0)}catch(e){try{return n.call(null,t,0)}catch(e){return n.call(this,t,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(t){n=i}try{r="function"==typeof clearTimeout?clearTimeout:u}catch(t){r=u}}();var s,a=[],f=!1,l=-1;function d(){f&&s&&(f=!1,s.length?a=s.concat(a):l=-1,a.length&&h())}function h(){if(!f){var t=c(d);f=!0;for(var e=a.length;e;){for(s=a,a=[];++l<e;)s&&s[l].run();l=-1,e=a.length}s=null,f=!1,function(t){if(r===clearTimeout)return clearTimeout(t);if((r===u||!r)&&clearTimeout)return r=clearTimeout,clearTimeout(t);try{r(t)}catch(e){try{return r.call(null,t)}catch(e){return r.call(this,t)}}}(t)}}function p(t,e){this.fun=t,this.array=e}function m(){}o.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)e[n-1]=arguments[n];a.push(new p(t,e)),1!==a.length||f||c(h)},p.prototype.run=function(){this.fun.apply(null,this.array)},o.title="browser",o.browser=!0,o.env={},o.argv=[],o.version="",o.versions={},o.on=m,o.addListener=m,o.once=m,o.off=m,o.removeListener=m,o.removeAllListeners=m,o.emit=m,o.prependListener=m,o.prependOnceListener=m,o.listeners=function(t){return[]},o.binding=function(t){throw new Error("process.binding is not supported")},o.cwd=function(){return"/"},o.chdir=function(t){throw new Error("process.chdir is not supported")},o.umask=function(){return 0}},function(t,e,n){"use strict";t.exports=async(t,...e)=>{!function(t){if("function"!=typeof t)throw Error("fn should be a function!")}(t);try{return[null,await t(...e)]}catch(t){return[t]}}},function(t,e,n){"use strict";const r=(t,...e)=>{if(function(t){if("function"!=typeof t)throw Error("fn should be function!")}(t),e.length>=t.length)return t(...e);const n=(...n)=>r(t,...e,...n),o=t.length-e.length-1;return(t=>[function(e){return t(...arguments)},function(e,n){return t(...arguments)},function(e,n,r){return t(...arguments)},function(e,n,r,o){return t(...arguments)},function(e,n,r,o,i){return t(...arguments)}])(n)[o]||n};t.exports=r}]);
+        !function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="/dist/",n(n.s=0)}([function(t,e,n){"use strict";const r=n(1),o=n(2),i=n(3),u="development"===r.env.NODE_ENV,c=i((t,e)=>e.waitUntil(t())),s=i((t,e)=>{const{request:n}=e,{url:r}=n,o=a(r);r.endsWith("/")||/\^\/fs/.test(o)||"GET"===n.method&&(t=>"basic"===t.type)(n)&&(o.startsWith("/api")||/^socket.io/.test(o)||e.respondWith(t(e)))}),a=t=>new URL(t).pathname,f="cloudcmd: Fri Mar 29 2024 16:01:37 GMT+0200 (Eastern European Standard Time)",l=(t,e)=>"/"!==t?e:(t=>new Request(t,{credentials:"same-origin"}))("/");self.addEventListener("install",c((async function(){console.info("cloudcmd: sw: install: "+f),await self.skipWaiting()}))),self.addEventListener("fetch",s((async function(t){const{request:e}=t,{url:n}=e,r=a(n),i=l(r,t.request),c=await caches.open(f),s=await c.match(e);if(!u&&s)return s;const[d,h]=await o(fetch,i,{credentials:"same-origin"});return d?new Response(d.message):(await async function(t,e){return(await caches.open(f)).put(t,e)}(e,h.clone()),h)}))),self.addEventListener("activate",c((async function(){console.info("cloudcmd: sw: activate: "+f),await self.clients.claim();const t=await caches.keys(),e=caches.delete.bind(caches);await Promise.all(t.map(e))})))},function(t,e){var n,r,o=t.exports={};function i(){throw new Error("setTimeout has not been defined")}function u(){throw new Error("clearTimeout has not been defined")}function c(t){if(n===setTimeout)return setTimeout(t,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(t,0);try{return n(t,0)}catch(e){try{return n.call(null,t,0)}catch(e){return n.call(this,t,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(t){n=i}try{r="function"==typeof clearTimeout?clearTimeout:u}catch(t){r=u}}();var s,a=[],f=!1,l=-1;function d(){f&&s&&(f=!1,s.length?a=s.concat(a):l=-1,a.length&&h())}function h(){if(!f){var t=c(d);f=!0;for(var e=a.length;e;){for(s=a,a=[];++l<e;)s&&s[l].run();l=-1,e=a.length}s=null,f=!1,function(t){if(r===clearTimeout)return clearTimeout(t);if((r===u||!r)&&clearTimeout)return r=clearTimeout,clearTimeout(t);try{r(t)}catch(e){try{return r.call(null,t)}catch(e){return r.call(this,t)}}}(t)}}function p(t,e){this.fun=t,this.array=e}function m(){}o.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)e[n-1]=arguments[n];a.push(new p(t,e)),1!==a.length||f||c(h)},p.prototype.run=function(){this.fun.apply(null,this.array)},o.title="browser",o.browser=!0,o.env={},o.argv=[],o.version="",o.versions={},o.on=m,o.addListener=m,o.once=m,o.off=m,o.removeListener=m,o.removeAllListeners=m,o.emit=m,o.prependListener=m,o.prependOnceListener=m,o.listeners=function(t){return[]},o.binding=function(t){throw new Error("process.binding is not supported")},o.cwd=function(){return"/"},o.chdir=function(t){throw new Error("process.chdir is not supported")},o.umask=function(){return 0}},function(t,e,n){"use strict";t.exports=async(t,...e)=>{!function(t){if("function"!=typeof t)throw Error("fn should be a function!")}(t);try{return[null,await t(...e)]}catch(t){return[t]}}},function(t,e,n){"use strict";const r=(t,...e)=>{if(function(t){if("function"!=typeof t)throw Error("fn should be function!")}(t),e.length>=t.length)return t(...e);const n=(...n)=>r(t,...e,...n),o=t.length-e.length-1;return(t=>[function(e){return t(...arguments)},function(e,n){return t(...arguments)},function(e,n,r){return t(...arguments)},function(e,n,r,o){return t(...arguments)},function(e,n,r,o,i){return t(...arguments)}])(n)[o]||n};t.exports=r}]);
 //# sourceMappingURL=sw.js.map

package/dist-dev/sw.js

@@ -103,7 +103,7 @@ var serviceWorkerOption = {
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n\nconst process = __webpack_require__(/*! node:process */ \"./node_modules/process/browser.js\");\nconst tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\nconst currify = __webpack_require__(/*! currify */ \"./node_modules/currify/lib/currify.js\");\nconst isDev = process.env.NODE_ENV === 'development';\nconst isGet = a => a.method === 'GET';\nconst isBasic = a => a.type === 'basic';\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});\nconst getPathName = url => new URL(url).pathname;\nconst date = \"Fri Mar 29 2024 13:28:49 GMT+0200 (Eastern European Standard Time)\";\nconst NAME = `cloudcmd: ${date}`;\nconst createRequest = a => new Request(a, {\n  credentials: 'same-origin'\n});\nconst getRequest = (a, request) => {\n  if (a !== '/') return request;\n  return createRequest('/');\n};\nself.addEventListener('install', wait(onInstall));\nself.addEventListener('fetch', respondWith(onFetch));\nself.addEventListener('activate', wait(onActivate));\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}\nasync function onInstall() {\n  console.info(`cloudcmd: sw: install: ${NAME}`);\n  await self.skipWaiting();\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}\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 process = __webpack_require__(/*! node:process */ \"./node_modules/process/browser.js\");\nconst tryToCatch = __webpack_require__(/*! try-to-catch */ \"./node_modules/try-to-catch/lib/try-to-catch.js\");\nconst currify = __webpack_require__(/*! currify */ \"./node_modules/currify/lib/currify.js\");\nconst isDev = process.env.NODE_ENV === 'development';\nconst isGet = a => a.method === 'GET';\nconst isBasic = a => a.type === 'basic';\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});\nconst getPathName = url => new URL(url).pathname;\nconst date = \"Fri Mar 29 2024 16:01:43 GMT+0200 (Eastern European Standard Time)\";\nconst NAME = `cloudcmd: ${date}`;\nconst createRequest = a => new Request(a, {\n  credentials: 'same-origin'\n});\nconst getRequest = (a, request) => {\n  if (a !== '/') return request;\n  return createRequest('/');\n};\nself.addEventListener('install', wait(onInstall));\nself.addEventListener('fetch', respondWith(onFetch));\nself.addEventListener('activate', wait(onActivate));\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}\nasync function onInstall() {\n  console.info(`cloudcmd: sw: install: ${NAME}`);\n  await self.skipWaiting();\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}\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": "17.3.0",
+  "version": "17.3.2",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "File manager for the web with console and editor",

package/server/cloudcmd.mjs

@@ -24,7 +24,7 @@ import route from './route.mjs';
 import * as validate from './validate.mjs';
 import prefixer from './prefixer.js';
 import terminal from './terminal.js';
-import distribute from './distribute/index.js';
+import {distributeExport} from './distribute/export.mjs';
 import {createDepStore} from './depstore.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -175,7 +175,7 @@ function listen({prefixSocket, socket, config}) {
         autoRestart: config('terminalAutoRestart'),
     });
     
-    distribute.export(config, socket);
+    distributeExport(config, socket);
 }
 
 function cloudcmdMiddle({modules, config}) {

package/server/config.js

@@ -35,7 +35,7 @@ const ConfigPath = path.join(DIR, 'json/config.json');
 const ConfigHome = path.join(HOME, '.cloudcmd.json');
 
 const connection = currify(_connection);
-const connectionWraped = wraptile(_connection);
+const connectionWrapped = wraptile(_connection);
 const middle = currify(_middle);
 
 const readjsonSync = (name) => {
@@ -155,7 +155,7 @@ function listen(manage, sock, auth) {
                 return connection(manage, socket);
             
             const reject = () => socket.emit('reject');
-            socket.on('auth', auth(connectionWraped(manage, socket), reject));
+            socket.on('auth', auth(connectionWrapped(manage, socket), reject));
         });
 }
 

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

@@ -1,13 +1,8 @@
-'use strict';
-
-const currify = require('currify');
-const wraptile = require('wraptile');
-const squad = require('squad');
-const omit = require('object.omit');
-
-const log = require('./log');
-
-const {
+import currify from 'currify';
+import wraptile from 'wraptile';
+import squad from 'squad';
+import omit from 'object.omit';
+import log, {
     exportStr,
     connectedStr,
     disconnectedStr,
@@ -15,8 +10,8 @@ const {
     makeColor,
     getMessage,
     getDescription,
-    logWraped,
-} = log;
+    logWrapped,
+} from './log.mjs';
 
 const omitList = [
     'auth',
@@ -38,7 +33,7 @@ const omitList = [
 
 const omitConfig = (config) => omit(config, omitList);
 
-module.exports = (config, socket) => {
+export const distributeExport = (config, socket) => {
     if (!config('export'))
         return;
     
@@ -46,9 +41,9 @@ module.exports = (config, socket) => {
     const distributePrefix = `${prefix}/distribute`;
     const isLog = config('log');
     
-    const onError = squad(logWraped(isLog, exportStr), getMessage);
+    const onError = squad(logWrapped(isLog, exportStr), getMessage);
     
-    const onConnectError = squad(logWraped(isLog, exportStr), getDescription);
+    const onConnectError = squad(logWrapped(isLog, exportStr), getDescription);
     
     socket
         .of(distributePrefix)

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

@@ -1,16 +1,14 @@
-'use strict';
+import currify from 'currify';
+import wraptile from 'wraptile';
+import squad from 'squad';
+import fullstore from 'fullstore';
+import io from 'socket.io-client';
+import log from './log.mjs';
+import env from '../env.js';
+import _forEachKey from 'for-each-key';
 
-const currify = require('currify');
-const wraptile = require('wraptile');
-const squad = require('squad');
-const fullstore = require('fullstore');
-
-const io = require('socket.io-client');
-const log = require('./log');
-
-const env = require('../env');
 const noop = () => {};
-const forEachKey = currify(require('for-each-key'));
+const forEachKey = currify(_forEachKey);
 
 const {
     importStr,
@@ -20,7 +18,7 @@ const {
     authTryStr,
     getMessage,
     getDescription,
-    logWraped,
+    logWrapped,
 } = log;
 
 const {entries} = Object;
@@ -67,7 +65,7 @@ const updateConfig = currify((config, data) => {
     }
 });
 
-module.exports = (config, options, fn) => {
+export const distributeImport = (config, options, fn) => {
     fn = fn || options;
     
     if (!config('import'))
@@ -96,23 +94,23 @@ module.exports = (config, options, fn) => {
     const close = closeIfNot(socket, importListen);
     
     const statusStore = fullstore();
-    const statusStoreWraped = wraptile(statusStore);
+    const statusStoreWrapped = wraptile(statusStore);
     
-    const onConfig = squad(close, logWraped(isLog, importStr, `config received from ${colorUrl}`), statusStoreWraped('received'), updateConfig(config));
+    const onConfig = squad(close, logWrapped(isLog, importStr, `config received from ${colorUrl}`), statusStoreWrapped('received'), updateConfig(config));
     
-    const onError = squad(superFn('error'), logWraped(isLog, config, importStr), addUrl(colorUrl), getMessage);
+    const onError = squad(superFn('error'), logWrapped(isLog, config, importStr), addUrl(colorUrl), getMessage);
     
-    const onConnectError = squad(superFn('connect_error'), logWraped(isLog, importStr), addUrl(colorUrl), getDescription);
+    const onConnectError = squad(superFn('connect_error'), logWrapped(isLog, importStr), addUrl(colorUrl), getDescription);
     
     const onConnect = emitAuth(importUrl, config, socket);
-    const onAccept = logWraped(isLog, importStr, `${connectedStr} to ${colorUrl}`);
+    const onAccept = logWrapped(isLog, importStr, `${connectedStr} to ${colorUrl}`);
     
     const onDisconnect = squad(
         done(
             fn,
             statusStore,
         ),
-        logWraped(
+        logWrapped(
             isLog,
             importStr,
             `${disconnectedStr} from ${colorUrl}`,
@@ -127,9 +125,9 @@ module.exports = (config, options, fn) => {
         ),
     );
     
-    const onChange = squad(logWraped(isLog, importStr), config);
+    const onChange = squad(logWrapped(isLog, importStr), config);
     
-    const onReject = squad(superFn('reject'), logWraped(
+    const onReject = squad(superFn('reject'), logWrapped(
         isLog,
         importStr,
         tokenRejectedStr,

package/server/distribute/import.spec.mjs

@@ -1,15 +1,13 @@
-import {createRequire} from 'node:module';
 import process from 'node:process';
 import test from 'supertape';
 import {promisify} from 'node:util';
 import tryToCatch from 'try-to-catch';
 import {connect} from '../../test/before.mjs';
 import {createConfigManager} from '../cloudcmd.mjs';
-
-const require = createRequire(import.meta.url);
+import {distributeImport} from './import.mjs';
 
 const distribute = {
-    import: promisify(require('./import')),
+    import: promisify(distributeImport),
 };
 
 const config = createConfigManager();

package/server/distribute/log.mjs

@@ -0,0 +1,52 @@
+import wraptile from 'wraptile';
+import chalk from 'chalk';
+import datetime from '../../common/datetime.js';
+
+const {assign} = Object;
+
+const log = (isLog, name, msg) => isLog && console.log(`${datetime()} -> ${name}: ${msg}`);
+
+export const makeColor = (a) => chalk.blue(a);
+export const getMessage = (e) => e.message || e;
+export const getDescription = (e) => e.message;
+
+export default log;
+
+export const logWrapped = wraptile(log);
+
+export const importStr = 'import';
+export const exportStr = 'export';
+export const connectedStr = chalk.green('connected');
+export const disconnectedStr = chalk.red('disconnected');
+export const tokenRejectedStr = chalk.red('token rejected');
+export const authTryStr = chalk.yellow('try to auth');
+
+export function stringToRGB(a) {
+    return [
+        a.charCodeAt(0),
+        a.length,
+        crc(a),
+    ];
+}
+
+const add = (a, b) => a + b.charCodeAt(0);
+
+function crc(a) {
+    return a
+        .split('')
+        .reduce(add, 0);
+}
+
+assign(log, {
+    getMessage,
+    makeColor,
+    getDescription,
+    authTryStr,
+    stringToRGB,
+    logWrapped,
+    importStr,
+    exportStr,
+    connectedStr,
+    disconnectedStr,
+    tokenRejectedStr,
+});

package/server/distribute/log.spec.mjs

@@ -0,0 +1,34 @@
+import test from 'supertape';
+import log from './log.mjs';
+import {createConfig} from '../config.js';
+
+test('distribute: log: getMessage', (t) => {
+    const e = 'hello';
+    const result = log.getMessage(e);
+    
+    t.equal(e, result);
+    t.end();
+});
+
+test('distribute: log: getMessage: message', (t) => {
+    const message = 'hello';
+    const result = log.getMessage({
+        message,
+    });
+    
+    t.equal(result, message);
+    t.end();
+});
+
+test('distribute: log: config', (t) => {
+    const config = createConfig();
+    const logOriginal = config('log');
+    
+    config('log', true);
+    log('log', 'test message');
+    config('log', logOriginal);
+    
+    t.end();
+}, {
+    checkAssertionsCount: false,
+});

package/server/distribute/index.js

@@ -1,4 +0,0 @@
-'use strict';
-
-module.exports.import = require('./import');
-module.exports.export = require('./export');

package/server/distribute/log.js

@@ -1,41 +0,0 @@
-'use strict';
-
-const wraptile = require('wraptile');
-const chalk = require('chalk');
-
-const datetime = require('../../common/datetime');
-
-const log = (isLog, name, msg) => isLog && console.log(`${datetime()} -> ${name}: ${msg}`);
-const makeColor = (a) => chalk.blue(a);
-const getMessage = (e) => e.message || e;
-const getDescription = (e) => e.message;
-
-module.exports = log;
-module.exports.logWraped = wraptile(log);
-module.exports.stringToRGB = stringToRGB;
-module.exports.makeColor = makeColor;
-module.exports.getMessage = getMessage;
-module.exports.getDescription = getDescription;
-
-module.exports.importStr = 'import';
-module.exports.exportStr = 'export';
-module.exports.connectedStr = chalk.green('connected');
-module.exports.disconnectedStr = chalk.red('disconnected');
-module.exports.tokenRejectedStr = chalk.red('token rejected');
-module.exports.authTryStr = chalk.yellow('try to auth');
-
-function stringToRGB(a) {
-    return [
-        a.charCodeAt(0),
-        a.length,
-        crc(a),
-    ];
-}
-
-const add = (a, b) => a + b.charCodeAt(0);
-
-function crc(a) {
-    return a
-        .split('')
-        .reduce(add, 0);
-}