cloudcmd 17.1.4 → 17.1.6

package/server/cloudcmd.js

@@ -1,28 +1,12 @@
 'use strict';
 
+const {join} = require('node:path');
 const fullstore = require('fullstore');
 const process = require('node:process');
-const DIR = `${__dirname}/`;
-const DIR_COMMON = `${DIR}../common/`;
 const path = require('node:path');
-
 const fs = require('node: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`);
-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');
@@ -33,8 +17,25 @@ const dword = require('dword');
 const deepword = require('deepword');
 const nomine = require('nomine');
 const fileop = require('@cloudcmd/fileop');
-const DIR_ROOT = `${DIR}../`;
 
+const cloudfunc = require('../common/cloudfunc');
+
+const authentication = require('./auth');
+const {createConfig, configPath} = require(`./config`);
+
+const modulas = require(`./modulas`);
+
+const userMenu = require(`./user-menu`);
+const rest = require(`./rest`);
+const route = require(`./route`);
+const validate = require(`./validate`);
+const prefixer = require(`./prefixer`);
+const terminal = require(`./terminal`);
+const distribute = require(`./distribute`);
+const {createDepStore} = require('./depstore');
+const {assign} = Object;
+const DIR = `${__dirname}/`;
+const DIR_ROOT = join(DIR, '..');
 const getDist = (isDev) => isDev ? 'dist-dev' : 'dist';
 
 const isDev = fullstore(process.env.NODE_ENV === 'development');
@@ -49,7 +50,9 @@ const clean = (a) => a.filter(notEmpty);
 const isUndefined = (a) => typeof a === 'undefined';
 const isFn = (a) => typeof a === 'function';
 
-module.exports = (params) => {
+module.exports = cloudcmd;
+
+function cloudcmd(params) {
     const p = params || {};
     const options = p.config || {};
     const config = p.configManager || createConfig({
@@ -57,7 +60,6 @@ module.exports = (params) => {
     });
     
     const {modules} = p;
-    
     const keys = Object.keys(options);
     
     for (const name of keys) {
@@ -87,11 +89,17 @@ module.exports = (params) => {
             socket: p.socket,
         });
     
-    return cloudcmd({
+    return cloudcmdMiddle({
         modules,
         config,
     });
-};
+}
+
+const depStore = createDepStore();
+
+assign(cloudcmd, {
+    depStore,
+});
 
 module.exports.createConfigManager = createConfig;
 module.exports.configPath = configPath;
@@ -176,7 +184,7 @@ function listen({prefixSocket, socket, config}) {
     distribute.export(config, socket);
 }
 
-function cloudcmd({modules, config}) {
+function cloudcmdMiddle({modules, config}) {
     const online = apart(config, 'online');
     const cache = false;
     const diff = apart(config, 'diff');
@@ -243,6 +251,7 @@ function cloudcmd({modules, config}) {
         rest(config),
         route(config, {
             html,
+            win32: depStore('win32'),
         }),
         ponseStatic,
     ]);

package/server/config.js

@@ -153,7 +153,7 @@ function listen(manage, sock, auth) {
         .on('connection', (socket) => {
             if (!manage('auth'))
                 return connection(manage, socket);
-        
+            
             const reject = () => socket.emit('reject');
             socket.on('auth', auth(connectionWraped(manage, socket), reject));
         });

package/server/depstore.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports.createDepStore = () => {
+    let deps = {};
+    
+    return (name, value) => {
+        if (!name)
+            return deps = {};
+        
+        if (!value)
+            return deps[name];
+        
+        deps[name] = value;
+    };
+};

package/server/repl.js

@@ -9,7 +9,7 @@ module.exports = net
         const {pid} = process;
         const addr = socket.remoteAddress;
         const port = socket.remotePort;
-    
+        
         const r = repl.start({
             prompt: `[${pid} ${addr}:${port}>`,
             input: socket,
@@ -17,11 +17,11 @@ module.exports = net
             terminal: true,
             useGlobal: false,
         });
-    
+        
         r.on('exit', () => {
             socket.end();
         });
-    
+        
         r.context.socket = socket;
     })
     .listen(1337);

package/server/root.js

@@ -2,6 +2,6 @@
 
 const mellow = require('mellow');
 
-module.exports = (dir, root) => {
-    return mellow.webToWin(dir, root || '/');
+module.exports = (dir, root, {webToWin = mellow.webToWin} = {}) => {
+    return webToWin(dir, root || '/');
 };

package/server/route.js

@@ -2,7 +2,7 @@
 
 const {extname} = require('node:path');
 
-const {read} = require('win32');
+const _win32 = require('win32');
 const ponse = require('ponse');
 const rendy = require('rendy');
 const format = require('format-io');
@@ -34,9 +34,9 @@ const sendIndex = (params, data) => {
 const onceRequire = once(require);
 const getPrefix = (config) => prefixer(config('prefix'));
 
-const getReadDir = (config) => {
+const getReadDir = (config, {win32 = _win32} = {}) => {
     if (!config('dropbox'))
-        return read;
+        return win32.read;
     
     const {readDir} = onceRequire('@cloudcmd/dropbox');
     
@@ -78,13 +78,15 @@ async function route({config, options, request, response}) {
     const rootName = name.replace(CloudFunc.FS, '') || '/';
     const fullPath = root(rootName, config('root'));
     
-    const read = getReadDir(config);
+    const {html, win32} = options;
+    const read = getReadDir(config, {
+        win32,
+    });
+    
     const [error, stream] = await tryToCatch(read, fullPath, {
         root: config('root'),
     });
     
-    const {html} = options;
-    
     if (error)
         return ponse.sendError(error, p);
     

package/server/user-menu.js

@@ -84,9 +84,9 @@ function getError(error, source) {
         source,
         highlightCode: false,
     })}</pre>\`);
-
+        
         e.code = 'frame';
-
+        
         throw e;
     `;
 }

package/server/validate.js

@@ -1,12 +1,13 @@
 'use strict';
 
+const {statSync: _statSync} = require('node:fs');
 const tryCatch = require('try-catch');
 
-const exit = require('./exit');
-const {getColumns} = require('./columns');
+const _exit = require('./exit');
+const {getColumns: _getColumns} = require('./columns');
 const isString = (a) => typeof a === 'string';
 
-module.exports.root = (dir, config) => {
+module.exports.root = (dir, config, {exit = _exit, statSync = _statSync} = {}) => {
     if (!isString(dir))
         throw Error('dir should be a string');
     
@@ -16,28 +17,27 @@ module.exports.root = (dir, config) => {
     if (config('dropbox'))
         return;
     
-    const {statSync} = require('node:fs');
     const [error] = tryCatch(statSync, dir);
     
     if (error)
         return exit('cloudcmd --root: %s', error.message);
 };
 
-module.exports.editor = (name) => {
+module.exports.editor = (name, {exit = _exit} = {}) => {
     const reg = /^(dword|edward|deepword)$/;
     
     if (!reg.test(name))
         exit('cloudcmd --editor: could be "dword", "edward" or "deepword" only');
 };
 
-module.exports.packer = (name) => {
+module.exports.packer = (name, {exit = _exit} = {}) => {
     const reg = /^(tar|zip)$/;
     
     if (!reg.test(name))
         exit('cloudcmd --packer: could be "tar" or "zip" only');
 };
 
-module.exports.columns = (type) => {
+module.exports.columns = (type, {exit = _exit, getColumns = _getColumns} = {}) => {
     const addQuotes = (a) => `"${a}"`;
     const all = Object
         .keys(getColumns())