jsir 2.0.4 → 2.0.6

package/cmd/oaa.js

@@ -1,41 +1,58 @@
 #!/usr/bin/env node
+const path = require('path');
+const {spawnSync} = require('child_process');
+const globalDirectories = require('global-dirs');
+let nodePath = process.env.NODE_PATH ? process.env.NODE_PATH.trim():'';
+let avoidFlag = path.delimiter + path.delimiter + path.delimiter;
+if (!nodePath.endsWith(avoidFlag) && nodePath.indexOf(globalDirectories.npm.packages) === -1) {
+    process.env.NODE_PATH = [globalDirectories.npm.packages, nodePath].filter(i => i).join(path.delimiter) + avoidFlag
+    process.on('SIGINT', function () {});
+    spawnSync(process.argv[0], process.argv.slice(1), {stdio:"inherit"});
+    return;
+}
+
+const $lib = require('../util');
 const {
     getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, vl, md5, BigNumber,
     info, warn, error, arrayDataFile, infoStr, warnStr, errorStack,
     getInfo, ei, pad, msgStr, getType,
     errorTag, isArgsMatch, draftQuery, setConfig,
-    $log, $draft, $config, getTextComments
-} = require('../util')
+    $log, $draft, getTextComments
+} = $lib;
+const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../evalCode')
+const _chokidar = require('chokidar');
+const setting = require('../setting')
+const _fs = require('fs')
+const readline = require("readline");
 
+const _workspaceConfigFile = 'workspace.json';
+const _libDataDir = getLibDataDir()
+const _tipsOnRm = {}
+const _fileWatcherMap = {}
 const _types = {
     'e': "exe",
     'i': "init",
     'f': "file"
 }
-const _chokidar = require('chokidar');
-const _fs = require('fs')
-const _libDataDir = getLibDataDir()
-const _args = process.argv.slice(2).map(trim)
-const _history9 = []
-const _tipsOnRm = {}
-const readline = require("readline");
-const _fileWatcherMap = {}
-const setting = require('../setting')
+const $config = {
+    get: getConfig,
+    set: setConfig
+}
+
 let _cmdMapFile = setting.name + 'CmdMap.json'
 let _cmdMap = {}
 let _rl
 let _rlHistory = []
 let _haveWrapperInput = true
-let _workspaceConfigFile = 'workspace.json';
 let _exit = false
 
 const _data = {}
 const $data = {
-    get: (key, val) => {
-        if (!(key in _data) && val !== undefined) {
-            _data[key] = val
+    get: (key, defaultVal) => {
+        if (!(key in _data) && defaultVal !== undefined) {
+            _data[key] = defaultVal
         }
         return _data[key]
     },
@@ -48,7 +65,6 @@ const $data = {
     keys: () => Object.keys(_data)
 }
 const $homeDir = getLibDataDir()
-const $lib = {...require('../util')}
 
 global.$tips = {}
 global.$newInput = false
@@ -95,10 +111,8 @@ function checkWorkspaces() {
 async function start() {
     checkWorkspaces()
 
+    _cmdMap = objDataFile(_cmdMapFile)
     if (_args[0]) {
-        if (_noAppendNextLine) {
-            _cmdMap = objDataFile(_cmdMapFile)
-        }
         let line = _args.map(i => {
             if (/\s+/.test(i) || !i) {
                 i = `"${i}"`
@@ -107,8 +121,12 @@ async function start() {
         }).join(' ')
         await wrapperInput(line)
     } else {
-        _noAppendNextLine = false
-        console.log(warnStr("You can start with .help, use * to expand context"))
+        let defaultAction = getConfig("defaultAction", "repl");
+        if (defaultAction && keywordDef[defaultAction]) {
+            await wrapperInput('.' + defaultAction)
+        } else {
+            await wrapperInput('.repl')
+        }
     }
 }
 
@@ -247,7 +265,7 @@ function initRl(callback, preStr, hidden) {
     if (promptStr !== '') {
         promptStr = (preStr
             || ((callback && callback !== wrapperInput) ? "-> ":"")
-            || [Object.values(global.$tips).filter(i => String(i)).join(','), $defaultSpace].filter(i => i).join(':') + `> `)
+            || [Object.values(global.$tips).map(String).filter(i => i).map(i => i.replace(/,/g, '-')).join(','), $defaultSpace].filter(i => i).join(':') + `> `)
         promptStr = infoStr(promptStr)
     }
     if (hidden) {
@@ -396,26 +414,6 @@ function rename(dir, oldName, newName) {
     listCmd()
 }
 
-function putHis(x) {
-    if (_history9.indexOf(x) !== -1) {
-        _history9.splice(_history9.indexOf(x), 1)
-    }
-    _history9.push(x)
-    if (_history9.length > 9) {
-        _history9.shift()
-    }
-}
-
-function hisToCmdMap() {
-    let i = 1
-    let cmdMap = {}
-    for (let item of _history9) {
-        cmdMap[i] = item
-        i ++
-    }
-    _cmdMap = cmdMap
-}
-
 function listCmd() {
     let items = Object.values(_cmdMap)
         .filter(item => _fs.existsSync(getFullPath(item)))
@@ -527,18 +525,14 @@ async function _wrapperInput(str) {
             if (!text) {
                 text = '$context';
             }
-            let items = text.split(/\s+/).map(trim).filter(i => i)
-            let result = await evalText('return ' + items[0])
+            let result = await evalText('return ' + text)
             if (!result || typeof result === 'string' || Object.keys(result).length === 0) {
                 console.nable([getInfo(result)])
                 return
             }
             let rows = []
-            let matchs = items.slice(1)
             for (let key of Object.keys(result)) {
-                if (matchs.length === 0 || isArgsMatch(key, [matchs.join(' ')])){
-                    rows.push(getInfo(result[key], key))
-                }
+                rows.push(getInfo(result[key], key))
             }
             if (rows.length === 0) {
                 warn("no items")
@@ -549,9 +543,9 @@ async function _wrapperInput(str) {
             await evalText(text)
         }
     } else if (str.match(/^\./)) {
-        let argsStr = trim(str.substring(1))
-        if (argsStr) {
-            await dealKeyword(argsStr)
+        let items = enrichArgs(trim(str.substring(1))).map(trim)
+        if (items.length > 0) {
+            await dealKeyword(items[0], items.slice(1))
         } else {
             help()
         }
@@ -561,7 +555,6 @@ async function _wrapperInput(str) {
     } else {
         let strs = str.split(/\s+/)
         if (_cmdMap[strs[0]]) {
-            putHis(_cmdMap[strs[0]])
             let path = getFullPath(_cmdMap[strs[0]])
             let uniqueName = trim(_cmdMap[strs[0]]);
             let fileName = parseUniqueName(uniqueName)[1]
@@ -699,7 +692,7 @@ const keywordDef = {
         exeFn: (args) => {
             help()
         },
-        short: 'H'
+        short: 'h'
     },
     list: {
         comment: '查看文件列表',
@@ -710,7 +703,7 @@ const keywordDef = {
             listCmd()
         },
         args: {
-            queryParams: '条件参数(param1,param2 param3 ...), [,]代表全部'
+            queryParams: '字符串匹配，[,]代表全部，关键字可以省略'
         },
         short: 'l'
     },
@@ -873,14 +866,6 @@ const keywordDef = {
     //     },
     //     short: 'd'
     // },
-    history: {
-        comment: '查看执行记录',
-        exeFn: (args) => {
-            hisToCmdMap()
-            listCmd()
-        },
-        short: 'h'
-    },
     file: {
         comment: '工作文件模式',
         exeFn: async (args) => {
@@ -1009,20 +994,28 @@ const keywordDef = {
             process.exit(0)
         },
         short: 'q'
+    },
+    repl: {
+        comment: '交互式界面',
+        exeFn: (args) => {
+            _noAppendNextLine = false
+            console.log(warnStr("You can start with .help, use * to expand context"))
+            if (Object.keys(_cmdMap).length > 0) {
+                listCmd()
+            }
+        },
+        short: 'p'
     }
 }
 
-async function dealKeyword(str) {
+async function dealKeyword(keyword, args) {
     let unMatched = true;
     for (let key of Object.keys(keywordDef)) {
         let item = keywordDef[key]
-        let currStr = str === key ? item.short : str.replace(new RegExp(`^${key}\\s+`), item.short + ' ')
-        let strs = trim(currStr).split(/\s+/)
-        let fstr = strs[0]
-        let ostr = strs.slice(1)
-        if (item.short === fstr) {
+        let shortKey = keyword === key ? item.short : keyword;
+        if (item.short === shortKey) {
             unMatched = false;
-            await item.exeFn(ostr);
+            await item.exeFn(args);
             break;
         }
     }
@@ -1167,7 +1160,9 @@ function initWorkspace(space) {
     if (!$workspaceMap[current]) {
         workspace = 'local'
     }
-    setConfig("workspace", workspace)
+    if (workspace !== current) {
+        setConfig("workspace", workspace)
+    }
     global.$defaultSpace = workspace;
 }
 
@@ -1499,6 +1494,8 @@ async function _requireSource(currSpace, cmdMatchStr, printLog = false) {
         result = async (argsStr) => {
             return await runCmd(trim(argsStr), uniqueName, text)
         }
+    } else {
+        result = text;
     }
     if (!vl(result)) {
         if (nullable) {
@@ -1575,9 +1572,15 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         return (await _requireSources(currSpace, matchItem, printLog))[0]
     }
     try {
-        return await evalCode($text, $cmdName, $args, $data, $require, $requires,
-            nextLine, nextText, setTips, delTips, wrapperInput, filterCmd,
-            currSpace, $log, $draft, $config, $homeDir, $lib)
+        return await evalCode($text, $cmdName, $args,
+            $data, $config,
+            $require, $requires,
+            nextLine, nextText,
+            setTips, delTips,
+            wrapperInput, filterCmd,
+            currSpace,
+            $log, $draft,
+            $homeDir, $lib)
     } catch(e) {
         throw errorTag(e, $cmdName);
     }

package/evalCode.js

@@ -1,32 +1,25 @@
-const {info: $info, msg: $msg, warn: $warn, error: $error,
-    infoStr: $infoStr, msgStr: $msgStr, warnStr: $warnStr, errorStr: $errorStr,
-    tableStr: $tableStr, nableStr: $nableStr,
-    errorMsg: $errorMsg, errorStack: $errorStack} = require("./util");
-require = require("./util").requireG;
+const {info: $info, msg: $msg, warn: $warn, error: $error, importG: $import} = require("./util");
+require = require("./util").requireG
 module.exports = async ($text = '', $cmdName = '', $args = [],
-                        $data,
+                        $data, $config,
                         $require, $requires,
                         $nextLine, $nextText,
                         $setTips, $delTips,
                         $enter, $filterCmd,
-                        $currentSpace, $log,
-                        $draft, $config,
+                        $currentSpace,
+                        $log, $draft,
                         $homeDir, $lib) => {
     const $defArgs = () => $args;
     const $context = {
-        global, $data,
-        $require, $requires,
+        global, $data, $config,
+        $require, $requires, $import,
         $info, $msg, $warn, $error,
-        $infoStr, $msgStr, $warnStr, $errorStr,
-        $tableStr, $nableStr,
-        $errorMsg, $errorStack,
         $text, $cmdName, $args,
         $nextLine, $nextText,
         $setTips, $delTips,
         $enter, $filterCmd,
         $currentSpace, $log,
-        $draft, $config,
-        $homeDir, $lib
+        $draft, $homeDir, $lib
     }
     return await eval(`(async ()=>{${$text};
     })()`)

package/index.js

@@ -1,5 +1,4 @@
 
 module.exports = {
-    ...require('util'),
-    ...require('sol')
+    ...require('util')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {

package/util.js

@@ -37,57 +37,6 @@ const $draft = str => {
 }
 const $fnCache = {}
 
-const $config = {
-    _buildId: null,
-    build: async function () {
-        if ($config._buildId == null) {
-            await _buildConfig()
-        }
-    },
-    close: () => {
-        clearTimeout($config._buildId)
-        $config._buildId = null
-    },
-    localConfig: {},
-    remoteConfig: {},
-    getLocal: (key, defaultVal) => {
-        if (key && Object.keys($config.localConfig).indexOf(key) === -1) {
-            getConfig(key)
-        }
-        return getVl($config.localConfig[key], defaultVal)
-    },
-    getRemote: (key, defaultVal) => {
-        let machine = $config.getLocal('machine')
-        let remoteKey = `${machine}${machine ? '-':''}${key}`
-        return getVl($config.remoteConfig[remoteKey], $config.remoteConfig[key], defaultVal)
-    },
-    get: (key, defaultVal) => {
-        return getFnVl(() => $config.getRemote(key),
-            () => $config.getLocal(key), defaultVal)
-    },
-    set: (key, val) => {
-        $config.localConfig[key] = val
-        setConfig(key, val)
-    }
-}
-
-async function _buildConfig() {
-    try {
-        $config.localConfig = getConfig()
-        let remoteConfigIp = getConfig('remoteConfigIp')
-
-        if (remoteConfigIp) {
-            if (remoteConfigIp.indexOf(":") === -1) {
-                remoteConfigIp = remoteConfigIp+":9563"
-            }
-            $config.remoteConfig = (await got.get(`http://${remoteConfigIp}`)).data || $config.remoteConfig
-        } else {
-            $config.remoteConfig = {}
-        }
-    } catch (e) {}
-    $config._buildId = setTimeout(_buildConfig, 3000);
-}
-
 function isArgsMatch(text, args, callback, useMd5, md5Str) {
     let match = false
     for (let arg of args) {
@@ -389,11 +338,27 @@ function requireG(module){
     } catch (e) {}
     let path = globalDirectories.npm.packages + '/' + module;
     if (!fs.existsSync(path)) {
-        throw `ERROR: ${module} not found, use [npm install -g ${module}] to install it`;
+        console.log(warnStr(`npm install -g ${module}`))
+        throw `${module} not found, use above cmd to install it`;
     }
     return require(path);
 }
 
+async function importG(module) {
+    try {
+        let result = await import(module);
+        if (result) {
+            return result
+        }
+    } catch (e) {}
+    let path = globalDirectories.npm.packages + '/' + module;
+    if (!fs.existsSync(path)) {
+        console.log(warnStr(`npm install -g ${module}`))
+        throw `${module} not found, use above cmd to install it`;
+    }
+    return await import(path);
+}
+
 function validStr(str, name) {
     if (!vl(str) || typeof str !== 'string') {
         throw "invalid cipher " + name;
@@ -434,11 +399,11 @@ function aesDecipher(str, key){
     }
 }
 
-function getConfig(key, defaultVal = '') {
-    let configInit = {}
-    if (key) {
-        configInit[key] = ''
+function getConfig(key, defaultVal = null) {
+    if (typeof defaultVal === "string") {
+        defaultVal = trim(defaultVal)
     }
+    let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
     if (!fs.existsSync(configFile)) {
         fs.writeFileSync(configFile, JSON.stringify(configInit, null, 2));
@@ -448,23 +413,15 @@ function getConfig(key, defaultVal = '') {
     if (key === undefined) {
         return config
     }
-    let actConfigKeys = Object.keys(config);
     let writeFlag = false
-    for (let k of Object.keys(configInit)) {
-        if (actConfigKeys.indexOf(k) === -1) {
-            writeFlag = true
-            config[k] = ''
-        }
+    if (!(key in config)) {
+        writeFlag = true
+        config[key] = defaultVal
     }
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
-    let val
-    if (!(key in config)) {
-        val = defaultVal
-    } else {
-        val = config[key]
-    }
+    let val = config[key]
     if (typeof val === "string") {
         val = trim(val)
     }
@@ -491,25 +448,6 @@ function setConfig(key, val) {
     return val
 }
 
-async function getUniConfig(key, defaultVal) {
-    let remoteConfigIp = getConfig('remoteConfigIp')
-    let val
-    if (remoteConfigIp) {
-        if (remoteConfigIp.indexOf(":") === -1) {
-            remoteConfigIp = remoteConfigIp+":9563"
-        }
-        let machine = getConfig('machine')
-        val = (await got.get(`http://${remoteConfigIp}/${machine}${machine ? '-':''}${key}`)).data;
-        if (!vl(val)) {
-            val = (await got.get(`http://${remoteConfigIp}/${key}`)).data;
-        }
-    }
-    if (!vl(val)) {
-        val = getConfig(key, defaultVal)
-    }
-    return val;
-}
-
 function bAdd(str1, str2) {
     return new BigNumber(String(str1)).plus(new BigNumber(String(str2))).toString()
 }
@@ -1246,6 +1184,7 @@ module.exports = {
     aesCipher,
     aesDecipher,
     requireG,
+    importG,
     toBigNum,
     objDataFile,
     appendLog,
@@ -1258,7 +1197,6 @@ module.exports = {
     eFn,
     removeFirst,
     sleep,
-    getUniConfig,
     timeLimit,
     dayJs,
     setCbText,
@@ -1266,7 +1204,6 @@ module.exports = {
     vl,
     getVl,
     getFnVl,
-    $config,
     timeStr,
     splitArray,
     BigNumber,
@@ -1310,5 +1247,6 @@ module.exports = {
     iarrayDataFile,
     isArgsMatch,
     draftQuery,
-    getTextComments
+    getTextComments,
+    globalModulesPath: globalDirectories.npm.packages
 }

package/cmd/configServer.js

@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-let {$config, run, lisPid} = require('../util')
-
-const server = require('server');
-let address = require('address');
-const { get } = server.router;
-const {send} = server.reply
-
-let port = Number(process.argv[2] || 9563 )
-let router = [
-    get('/', () => {
-        return send($config.localConfig)
-    }),
-    get('/:key', (ctx) => {
-        if (!$config.localConfig.hasOwnProperty(ctx.params.key)) {
-            return send(null)
-        }
-        return send($config.getLocal(ctx.params.key))
-    })
-]
-
-lisPid('configServer_' + port)
-
-run(async () => {
-    await $config.build()
-    await server({
-        port
-    },router);
-    console.log("http://localhost:"+port);
-    console.log("http://" + address.ip()+":"+port);
-})

package/cmd/dirServer.js

@@ -1,61 +0,0 @@
-#!/usr/bin/env node
-let http = require('http');
-let url=require('url');
-let fs=require('fs');
-let mine=require('../source/mine').types;
-let path=require('path');
-let address = require('address');
-let urlencode = require('urlencode');
-let {lisPid} = require('../util')
-
-let server = http.createServer(function (request, response) {
-    let pathname = urlencode.decode(url.parse(request.url).pathname, "utf8");
-    let realPath = process.cwd() + pathname;
-    let ext = path.extname(realPath);
-    ext = ext ? ext.slice(1) : 'unknown';
-    if (fs.existsSync(realPath)) {
-        if (fs.statSync(realPath).isFile()) {
-            fs.readFile(realPath, "binary", function (err, file) {
-                if (err) {
-                    response.writeHead(500, {
-                        'Content-Type': 'text/plain'
-                    });
-                    response.end(err);
-                } else {
-                    let contentType = mine[ext] || "text/plain";
-                    response.writeHead(200, {
-                        'Content-Type': contentType
-                    });
-                    response.write(file, "binary");
-                    response.end();
-                }
-            });
-        } else {
-            let paths = fs.readdirSync(realPath)
-            response.writeHead(200, {
-                'Content-Type': 'text/html'
-            });
-            response.write('<head><meta charset="utf-8"/></head>');
-            paths.forEach(path => {
-                response.write(`
-                <a href="/${(request.url + '/').replace(/^\/+/, '')}${path}">${path}</a><br/>
-                `)
-            })
-            response.end();
-        }
-    } else {
-        response.writeHead(404, {
-            'Content-Type': 'text/plain'
-        });
-        response.write("This request URL " + pathname + " was not found on this server.");
-        response.end();
-    }
-});
-
-let port = process.argv[2] || 8088;
-server.listen(port);
-
-console.log("http://localhost:"+port);
-console.log("http://" + address.ip()+":"+port);
-
-lisPid('dirServer_' + port)