jsir 2.0.5 → 2.0.7

package/cmd/oaa.js

@@ -1,24 +1,26 @@
 #!/usr/bin/env node
-const $lib = require('../util');
 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, getTextComments, globalModulesPath
+    $log, $draft, getTextComments
 } = $lib;
-const _args = process.argv.slice(2).map(trim)
-let nodePath = trim(process.env.NODE_PATH)
-let avoidFlag = path.delimiter + path.delimiter + path.delimiter;
-if (!nodePath.endsWith(avoidFlag) && nodePath.indexOf(globalModulesPath) === -1) {
-    process.env.NODE_PATH = [globalModulesPath, nodePath].filter(i => i).join(path.delimiter) + avoidFlag
-    process.on('SIGINT', function () {});
-    ei(`jsir`, _args);
-    return;
-}
-
+const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../evalCode')
 const _chokidar = require('chokidar');
 const setting = require('../setting')
@@ -27,7 +29,6 @@ const readline = require("readline");
 
 const _workspaceConfigFile = 'workspace.json';
 const _libDataDir = getLibDataDir()
-const _history9 = []
 const _tipsOnRm = {}
 const _fileWatcherMap = {}
 const _types = {
@@ -50,16 +51,22 @@ let _exit = false
 const _data = {}
 const $data = {
     get: (key, defaultVal) => {
-        if (!(key in _data) && defaultVal !== undefined) {
-            _data[key] = defaultVal
+        if (!vl(_data[key]) && vl(defaultVal)) {
+            return defaultVal
         }
         return _data[key]
     },
-    set: (key, val) => {
-        _data[key] = val
+    gos: (key, defaultVal) => {
+        if (!vl(_data[key]) && vl(defaultVal)) {
+            _data[key] = defaultVal
+        }
+        return _data[key]
     },
+    set: (key, val) => _data[key] = val,
     del: (key) => {
+        let val = _data[key]
         delete _data[key]
+        return val
     },
     keys: () => Object.keys(_data)
 }
@@ -79,12 +86,11 @@ function getFileOpenExe(fileName) {
     if (strs.length > 1) {
         suffix = strs[strs.length - 1]
     }
+    let defaultExe = getConfig("defaultExe", "idea");
     if (!suffix) {
-        return 'idea'
+        return defaultExe
     }
-
-    let exe = getConfig(`${suffix}_exe`)
-    return exe || 'idea';
+    return getConfig(`${suffix}_exe`, defaultExe);
 }
 
 function checkWorkspaces() {
@@ -110,10 +116,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}"`
@@ -122,8 +126,7 @@ async function start() {
         }).join(' ')
         await wrapperInput(line)
     } else {
-        _noAppendNextLine = false
-        console.log(warnStr("You can start with .help, use * to expand context"))
+        await wrapperInput(getConfig("defaultAction", ".repl"))
     }
 }
 
@@ -262,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) {
@@ -411,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)))
@@ -542,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")
@@ -576,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]
@@ -714,7 +692,7 @@ const keywordDef = {
         exeFn: (args) => {
             help()
         },
-        short: 'H'
+        short: 'h'
     },
     list: {
         comment: '查看文件列表',
@@ -725,7 +703,7 @@ const keywordDef = {
             listCmd()
         },
         args: {
-            queryParams: '条件参数(param1,param2 param3 ...), [,]代表全部'
+            queryParams: '字符串匹配，[,]代表全部，关键字可以省略'
         },
         short: 'l'
     },
@@ -888,14 +866,6 @@ const keywordDef = {
     //     },
     //     short: 'd'
     // },
-    history: {
-        comment: '查看执行记录',
-        exeFn: (args) => {
-            hisToCmdMap()
-            listCmd()
-        },
-        short: 'h'
-    },
     file: {
         comment: '工作文件模式',
         exeFn: async (args) => {
@@ -1024,6 +994,17 @@ 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'
     }
 }
 
@@ -1179,7 +1160,9 @@ function initWorkspace(space) {
     if (!$workspaceMap[current]) {
         workspace = 'local'
     }
-    setConfig("workspace", workspace)
+    if (workspace !== current) {
+        setConfig("workspace", workspace)
+    }
     global.$defaultSpace = workspace;
 }
 
@@ -1511,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) {

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.5",
+  "version": "2.0.7",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {

package/util.js

@@ -135,7 +135,7 @@ function vl(obj) {
         return !Number.isNaN(obj)
     }
     if (typeof obj === 'string') {
-        obj = trim(obj)
+        obj = obj.trim()
     }
     return !(obj === null || obj === undefined || obj === '')
 }
@@ -400,9 +400,6 @@ function aesDecipher(str, key){
 }
 
 function getConfig(key, defaultVal) {
-    if (typeof defaultVal === "string") {
-        defaultVal = trim(defaultVal)
-    }
     let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
     if (!fs.existsSync(configFile)) {
@@ -414,13 +411,20 @@ function getConfig(key, defaultVal) {
         return config
     }
     let writeFlag = false
-    if (!(key in config) && defaultVal !== undefined) {
+    if (!(key in config)) {
         writeFlag = true
-        config[key] = defaultVal
+        config[key] = null
     }
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
+
+    if (typeof defaultVal === "string") {
+        defaultVal = trim(defaultVal)
+    }
+    if (!vl(config[key]) && vl(defaultVal)) {
+        return defaultVal
+    }
     let val = config[key]
     if (typeof val === "string") {
         val = trim(val)

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)

package/cmd/ethDataServer.js

@@ -1,77 +0,0 @@
-#!/usr/bin/env node
-let {getPrice, eFn, lisPid} = require('../util')
-let Web3 = require('web3');
-let web3 = new Web3("https://http-mainnet-node.huobichain.com");
-web3.eth.transactionPollingTimeout = 49
-global.web3 = web3
-const server = require('server');
-let address = require('address');
-
-let usdt = '0xa71edc38d189767582c38a3145b5873052c3e47a'
-let wht = '0x5545153ccfca01fbd7dd11c0b23ba694d9509a6f'
-let mdxFact = '0xb0b670fc1F7724119963018DB0BfA86aDb22d941'
-
-const { get } = server.router;
-let port = 9589
-
-let data = {
-    gasList: [],
-    htPrice: 0,
-    cost: 0,
-    timestamp: 0
-}
-
-let router = [
-    get('/', ctx => {
-        return data
-    })
-]
-
-lisPid('ethDataServer_' + port)
-
-setTimeout(() => {
-    refreshData().catch()
-    server({port},router);
-    console.log("http://localhost:"+port);
-    console.log("http://" + address.ip()+":"+port);
-}, 1000 * 5)
-
-async function refreshData() {
-    let time = Date.now()
-    try {
-        data.htPrice = await getPrice(wht, usdt, mdxFact);
-        await refreshGasList()
-    } catch (e) {
-        console.log(String(e))
-    } finally {
-        let cost = Date.now() - time
-        console.log('Refresh Data Cost: ' + cost)
-        data.cost = cost
-        data.timestamp = Date.now()
-    }
-    setTimeout(() => refreshData(), 1000)
-}
-
-async function refreshGasList() {
-    let blockInfo = await web3.eth.getBlock("pending")
-    if (blockInfo != null) {
-        let map = {}
-        let items = []
-        for (let txHash of blockInfo.transactions) {
-            items.push(eFn(async (txHash) => {
-                let rawTransaction = await web3.eth.getTransaction(txHash);
-                if (rawTransaction) {
-                    map[Number(rawTransaction.gasPrice) / (1000 * 1000 * 1000)] = true
-                }
-            }, txHash))
-        }
-        await Promise.all(items)
-        let list = Object.keys(map)
-        list = list.sort((a, b) => Number(b) - Number(a));
-        list = list.slice(0, 10)
-
-        if (list.length > 0) {
-            data.gasList = list
-        }
-    }
-}

package/cmd/mockServer.js

@@ -1,119 +0,0 @@
-#!/usr/bin/env node
-let fs = require('fs')
-const server = require('server');
-let address = require('address');
-let {lisPid, getLibDataDir, trim, fileCleaner, getCbText} = require('../util')
-let libRoot = getLibDataDir()
-let home = libRoot + '/mock'
-let readline = require('readline')
-try {
-    fs.mkdirSync(home)
-} catch (e) {}
-const { get, post } = server.router;
-let mockServerLog = libRoot + '/mockServer.log'
-let port = 9549
-let cmd = {
-    path,
-    start
-}
-if (!cmd[trim(process.argv[2])]) {
-    console.log(`ARGS EXAMPLE:
-path
-start [9549]`)
-    return;
-}
-cmd[trim(process.argv[2])]()
-
-function getPathMap() {
-    let pathMap = {}
-    let i = 1
-    fs.readdirSync(home).forEach(item => {
-        pathMap[String(i)] = item
-        i ++
-    })
-    return pathMap
-}
-function path(){
-    let map = getPathMap()
-    Object.keys(map).forEach(i => {
-        console.log(i + ": " + map[i].replace(/_-sep-_/g, '/'))
-    })
-
-    let rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-    })
-    process.stdout.write("> ")
-    rl.on('line', async (str) => {
-        str = trim(str)
-        if (map[str]) {
-            try {
-                console.log(String(fs.readFileSync(home + '/' + map[str].replace(/\//g, '_-sep-_'))))
-            } catch (e) {}
-        } else {
-            if (str) {
-                let url = `${home}/${str.replace(/\//g, '_-sep-_')}`
-                let textStr = await getCbText()
-                if (!textStr) {
-                    try {
-                        fs.unlinkSync(url)
-                    } catch (e) {}
-                } else {
-                    fs.writeFileSync(url, textStr)
-                }
-            }
-
-            map = getPathMap()
-            Object.keys(map).forEach(i => {
-                console.log(i + ": " + map[i].replace(/_-sep-_/g, '/'))
-            })
-        }
-
-        process.stdout.write("> ")
-    })
-}
-
-function start() {
-    if (process.argv[3]) {
-        port = trim(process.argv[3])
-    }
-    let router = [
-        get('/', ctx => {
-            let map = getPathMap();
-            return Object.values(map).map(item => item.replace(/_-sep-_/g, '/'))
-        }),
-        post('/', ctx => {
-            log(ctx.data);
-            let map = getPathMap();
-            return Object.values(map).map(item => item.replace(/_-sep-_/g, '/'))
-        })
-    ]
-    fs.readdirSync(home).forEach(item => {
-        let fn = ctx => {
-            let text = fs.readFileSync(`${home}/${item}`)
-            try {
-                (eval(`(()=>{${text}})()`))
-                return ((typeof ctx.return === 'object') ? ctx.return : String(ctx.return)) || {}
-            } catch (e) {
-                log(e)
-                return String(e)
-            }
-        }
-        let url = item.replace(/_-sep-_/g, '/')
-        router.push(get('/' + url, fn))
-        router.push(post('/' + url, fn))
-    })
-
-    fileCleaner(mockServerLog)
-    lisPid('mockServer_' + port)
-
-    console.log("http://localhost:"+port);
-    console.log("http://" + address.ip()+":"+port);
-    setTimeout(() => {
-        server({port},router);
-    }, 1000 * 5)
-}
-
-function log(s) {
-    fs.appendFileSync(mockServerLog, s + '\n')
-}

package/cmd/see.js

@@ -1,67 +0,0 @@
-#!/usr/bin/env node
-let fs = require('fs');
-let path = require('path')
-let {getLibDataDir, cleanFile} = require("../util")
-let readline = require('readline');
-let gua = require('../source/gua');
-let posJson = require('../source/pos');
-let desc = process.argv.splice(2).join(" ");
-let dataLibDir = getLibDataDir()
-let get = n => Math.floor(Math.random()*n) + 1;
-let down = get(8);
-let up = get(8);
-let pos = get(6);
-let result = down + "," + up + "," + pos;
-console.log(result);
-
-function save(content) {
-    let seeTxt = dataLibDir + "/see.txt";
-    fs.writeFileSync(seeTxt, content,
-        { encoding: 'utf8', flag: 'a' });
-    cleanFile(seeTxt)
-}
-if (desc) save(new Date() + "\t" + result + "\t" + desc + "\n");
-
-let key = `${gua[String(up)]}上${gua[String(down)]}下`;
-let changeStream = fs.createReadStream(path.resolve(__dirname, '../source/change.txt'));
-let changeLine = readline.createInterface({
-    input:changeStream
-});
-let found = false;
-let use = false;
-let text = '';
-changeLine.on('line',function (line) {
-    line = line.trim().replace(/-/g, "");
-    if (!line) return;
-
-    if (line.match(/^初[六九]/)) {
-        use = false;
-    }
-
-    let two = line.substr(0, 2);
-    if (use && (two.indexOf("六") !== -1 || two.indexOf("九") !== -1)) {
-        use = false;
-    }
-    if (two.indexOf(posJson[String(pos)]) !== -1
-        && (two.indexOf("六") !== -1 || two.indexOf("九") !== -1)) {
-        use = true;
-    }
-    if (line.match(/^第[一二三四五六七八九十]/)){
-        found = false;
-    }
-    if (found && use) {
-        text += line + "\n";
-    }
-    if (line.indexOf(key) !== -1) {
-        found = true;
-        use = true;
-    }
-});
-
-changeLine.on('close', () => {
-    console.log(text);
-    if (desc) save(text);
-});
-
-
-

package/cmd/solCd.js

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-let {sc, sd} = require('../sol')
-
-sc(...(process.argv.slice(2)))
-sd(...(process.argv.slice(2)))

package/cmd/solComplie.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-let {sc} = require('../sol')
-
-sc(...process.argv.slice(2))

package/cmd/solDeploy.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-let {sd} = require('../sol')
-
-sd(...process.argv.slice(2))

package/cmd/solTest.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-let {st} = require('../sol')
-
-st(...(process.argv.slice(2)))
-
-
-