cloudcmd 17.1.2 → 17.1.4

package/server/columns.js

@@ -1,9 +1,13 @@
 'use strict';
 
-const process = require('process');
-const path = require('path');
-const fs = require('fs');
+const fullstore = require('fullstore');
+const process = require('node:process');
+const path = require('node:path');
+const fs = require('node:fs');
+
+const {nanomemoize} = require('nano-memoize');
 const readFilesSync = require('@cloudcmd/read-files-sync');
+
 const isMap = (a) => /\.map$/.test(a);
 const not = (fn) => (a) => !fn(a);
 
@@ -12,19 +16,26 @@ const defaultColumns = {
     'name-size-date-owner-mode': '',
 };
 
-const isDev = process.env.NODE_ENV === 'development';
+const _isDev = fullstore(process.env.NODE_ENV === 'development');
 const getDist = (isDev) => isDev ? 'dist-dev' : 'dist';
 
-const dist = getDist(isDev);
-const columnsDir = path.join(__dirname, '..', dist, 'columns');
-
-const names = fs
-    .readdirSync(columnsDir)
-    .filter(not(isMap));
+module.exports.isDev = _isDev;
 
-const columns = readFilesSync(columnsDir, names, 'utf8');
-
-module.exports = {
-    ...columns,
-    ...defaultColumns,
+module.exports.getColumns = ({isDev = _isDev()} = {}) => {
+    const columns = readFilesSyncMemo(isDev);
+    
+    return {
+        ...columns,
+        ...defaultColumns,
+    };
 };
+
+const readFilesSyncMemo = nanomemoize((isDev) => {
+    const dist = getDist(isDev);
+    const columnsDir = path.join(__dirname, '..', dist, 'columns');
+    const names = fs
+        .readdirSync(columnsDir)
+        .filter(not(isMap));
+    
+    return readFilesSync(columnsDir, names, 'utf8');
+});

package/server/config.js

@@ -2,11 +2,11 @@
 
 const DIR_SERVER = `${__dirname}/`;
 const DIR_COMMON = '../common/';
-const path = require('path');
+const path = require('node:path');
 
-const fs = require('fs');
-const Emitter = require('events');
-const {homedir} = require('os');
+const fs = require('node:fs');
+const Emitter = require('node:events');
+const {homedir} = require('node:os');
 const exit = require(`${DIR_SERVER}exit`);
 
 const CloudFunc = require(`${DIR_COMMON}cloudfunc`);

package/server/env.js

@@ -2,7 +2,7 @@
 
 const snake = require('just-snake-case');
 
-const {env} = require('process');
+const {env} = require('node:process');
 const up = (a) => a.toUpperCase();
 
 module.exports = parse;

package/server/exit.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const process = require('process');
+const process = require('node:process');
 const getMessage = (a) => a?.message || a;
 
 module.exports = (...args) => {

package/server/markdown/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const {join} = require('path');
-const {callbackify} = require('util');
+const {join} = require('node:path');
+const {callbackify} = require('node:util');
 
 const pullout = require('pullout');
 const ponse = require('ponse');

package/server/repl.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const process = require('process');
-const net = require('net');
-const repl = require('repl');
+const process = require('node:process');
+const net = require('node:net');
+const repl = require('node:repl');
 
 module.exports = net
     .createServer((socket) => {

package/server/rest/index.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const process = require('process');
+const process = require('node:process');
 const DIR = '../';
 const DIR_COMMON = `${DIR}../common/`;
 
-const path = require('path');
-const fs = require('fs');
+const path = require('node:path');
+const fs = require('node:fs');
 
 const root = require(`${DIR}root`);
 const CloudFunc = require(`${DIR_COMMON}cloudfunc`);

package/server/rest/info.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const process = require('process');
+const process = require('node:process');
 const format = require('format-io');
 
 const {version} = require('../../package');

package/server/route.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const DIR_SERVER = './';
-const DIR_COMMON = '../common/';
-
-const {extname} = require('path');
+const {extname} = require('node:path');
 
 const {read} = require('win32');
 const ponse = require('ponse');
@@ -16,12 +13,13 @@ const once = require('once');
 const pipe = require('pipe-io');
 const {contentType} = require('mime-types');
 
-const root = require(`${DIR_SERVER}root`);
-const prefixer = require(`${DIR_SERVER}prefixer`);
-const CloudFunc = require(`${DIR_COMMON}cloudfunc`);
-const Columns = require(`${DIR_SERVER}/columns`);
-const Template = require(`${DIR_SERVER}/template`);
+const root = require(`./root`);
+const prefixer = require(`./prefixer`);
+const CloudFunc = require(`../common/cloudfunc`);
+const {getColumns} = require(`./columns`);
+const Template = require(`./template`);
 
+const {stringify} = JSON;
 const {FS} = CloudFunc;
 
 const sendIndex = (params, data) => {
@@ -164,8 +162,8 @@ function indexProcessing(config, options) {
         }),
         fm: left + right,
         prefix: getPrefix(config),
-        config: JSON.stringify(config('*')),
-        columns: Columns[config('columns')],
+        config: stringify(config('*')),
+        columns: getColumns()[config('columns')],
     });
     
     return data;

package/server/template.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const path = require('path');
+const path = require('node:path');
 const readFilesSync = require('@cloudcmd/read-files-sync');
 const templatePath = path.join(__dirname, '..', 'tmpl/fs');
 

package/server/user-menu.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const {homedir} = require('os');
-const {readFile} = require('fs/promises');
+const {homedir} = require('node:os');
+const {readFile} = require('node:fs/promises');
 
-const {join} = require('path');
+const {join} = require('node:path');
 
 const montag = require('montag');
 const tryToCatch = require('try-to-catch');

package/server/validate.js

@@ -3,7 +3,7 @@
 const tryCatch = require('try-catch');
 
 const exit = require('./exit');
-const columns = require('./columns');
+const {getColumns} = require('./columns');
 const isString = (a) => typeof a === 'string';
 
 module.exports.root = (dir, config) => {
@@ -16,7 +16,7 @@ module.exports.root = (dir, config) => {
     if (config('dropbox'))
         return;
     
-    const {statSync} = require('fs');
+    const {statSync} = require('node:fs');
     const [error] = tryCatch(statSync, dir);
     
     if (error)
@@ -40,7 +40,7 @@ module.exports.packer = (name) => {
 module.exports.columns = (type) => {
     const addQuotes = (a) => `"${a}"`;
     const all = Object
-        .keys(columns)
+        .keys(getColumns())
         .concat('');
     
     const names = all