jsir 1.2.8 → 1.2.9

package/cmd/ooa.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 const {
     run, getLibDataDir, trim, regEach, getConfig, mkdir, requireG, reget,
-    getCbText, e, sleep, objDataFile, setConfig, wrapRows, vl, md5, BigNumber,
+    getCbText, e, sleep, objDataFile, setConfig, vl, md5, BigNumber,
     info, warn, error, arrayDataFile, infoStr, warnStr, errorStr, errorStack,
-    getInfo, ei, pad, msg, msgStr
+    getInfo, ei, pad, msg, msgStr, isError, getType, tableStr, nableStr, objProfileRows
 } = require('../util')
 
 const _types = {
@@ -11,7 +11,7 @@ const _types = {
     'i': "init",
     'f': "file"
 }
-const _Chokidar = require('chokidar');
+const _chokidar = require('chokidar');
 const _fs = require('fs')
 const _libDataDir = getLibDataDir()
 const _home = _libDataDir + '/ooa'
@@ -38,12 +38,11 @@ try {
     error(e)
 }
 
-const _table = require('console.table')
 console.table = (...args) => {
-    console.log(trim(_table.getTable(...args)))
+    console.log(tableStr(...args))
 }
 console.nable = (rows) => {
-    console.table(wrapRows(rows))
+    console.log(nableStr(rows))
 }
 
 let _noAppendNextLine = true
@@ -107,6 +106,10 @@ const _mainCmdMap = {
     lib: {
         comment: "查看内置资源",
         cmd: ['*$lib ']
+    },
+    deps: {
+        comment: "查看依赖",
+        cmd: ['@^']
     }
 }
 
@@ -166,19 +169,7 @@ run(async () => {
             _cmdMap = objDataFile('ooaCmdMap.json')
         }
 
-        if (isMainCmd(['run', 'edit', 'rm', 'diff', 'push', 'pull'])
-            && _args[1] && !/^\d+$/.test(_args[1])) {
-            let name = toJsirFileName(`e ${_args[1]}`)
-            let path = _home + '/' + name
-            if (_fs.existsSync(path)) {
-                _cmdMap = {
-                    '1': name
-                }
-                _args[1] = '1'
-            }
-        }
-
-        if (isMainCmd(['run', 'edit', 'rm', 'diff', 'push', 'pull'])
+        if (isMainCmd(['run', 'edit', 'rm', 'diff', 'push', 'pull', 'deps'])
             && _args[1] && !/^\d+$/.test(_args[1])) {
             warn('wrong args')
             return
@@ -203,7 +194,7 @@ run(async () => {
             }
             return i
         }).join(' ').replace(/^@/, '')
-        if (isMainCmd(['run', 'edit', 'rm', 'diff', 'push', 'pull']) && !trim(argStr)) {
+        if (isMainCmd(['run', 'edit', 'rm', 'diff', 'push', 'pull', 'deps']) && !trim(argStr)) {
             _args[0] = '@'
         }
         if (isMainCmd(['ls']) && !trim(argStr)) {
@@ -259,7 +250,7 @@ async function getFileWatcher(fileName, workFile, text) {
         _fs.unlinkSync(workFile)
         await sleep(1000)
         _fs.writeFileSync(workFile, text)
-        let watcher = _Chokidar.watch([workFile]);
+        let watcher = _chokidar.watch([workFile]);
         _fileWatcherMap[workFile] = watcher;
         return watcher
     }
@@ -543,7 +534,7 @@ function hisToCmdMap() {
     _cmdMap = cmdMap
 }
 
-function listCmd(prefix, inputCmdMap) {
+function listCmd(prefixKey, inputCmdMap) {
     let currCmdMap = _cmdMap
     if (inputCmdMap) {
         currCmdMap =inputCmdMap;
@@ -565,7 +556,7 @@ function listCmd(prefix, inputCmdMap) {
         }
     }
     let items = Object.values(currCmdMap)
-        .filter(item => _fs.existsSync(_home + "/" + item) && (!prefix || prefixMap[item].indexOf(prefix) !== -1))
+        .filter(item => _fs.existsSync(_home + "/" + item) && (!prefixKey || prefixMap[item].indexOf(prefixKey) !== -1))
         .sort((a,b) => {
             let typeKeys = Object.keys(_types);
             let orderA = typeKeys.indexOf(a.split(/\s+/)[0]);
@@ -625,35 +616,6 @@ function listCmd(prefix, inputCmdMap) {
     }
 }
 
-function printObjProfile(result) {
-    result = Object.keys(result).map(key => {
-        return {
-            key,
-            type: typeof result[key]
-        }})
-        .sort((a,b) => {
-            return a.type >= b.type ? 1:-1
-        })
-
-    let temp = []
-    for(let i = 0; i< Object.keys(result).length; i+=3) {
-        let item = {}
-        temp.push(item)
-
-        item['type'] = result[i].type
-        item['name']= result[i].key
-        if (result[i+1]) {
-            item['type '] = result[i+1].type
-            item['name ']= result[i+1].key
-        }
-        if (result[i+2]) {
-            item['type  '] = result[i+2].type
-            item['name  ']= result[i+2].key
-        }
-    }
-    console.table(temp)
-}
-
 function draftQuery(fLine) {
     let lines = []
     let text = String(_fs.readFileSync(getLibDataDir() + "/log/draft.log"))
@@ -677,15 +639,21 @@ function draftQuery(fLine) {
     }
 
     let results = []
-    if (/^\d+$/.test(fLine)) {
-        let index = Math.abs(parseInt(fLine));
-        results.push(...lines.slice(- index))
-    } else {
+    if (!/^\d+$/.test(fLine)) {
+        let ss = fLine.split(/\s+/)
+        fLine = ss[0]
         for (let line of lines) {
-            if (isArgsMatch(line, fLine.split(/\s+/))) {
+            if (new RegExp(fLine, 'i').test(line)) {
                 results.push(line)
             }
         }
+        fLine = ss[1]
+        lines = results
+        results = []
+    }
+    if (fLine && /^\d+$/.test(fLine)) {
+        let index = Math.abs(parseInt(fLine));
+        results.push(...lines.slice(- index))
     }
     console.log(results.join("\n"))
 }
@@ -753,7 +721,7 @@ async function _wrapperInput(str) {
         if (is$) {
             let result = await evalText('return ' + text)
             if (result === $lib) {
-                printObjProfile(result)
+                console.table(objProfileRows(result))
             } else {
                 console.log(result)
             }
@@ -822,7 +790,6 @@ async function dealKeyword(str, strs, fstr, ostr) {
             let path = _home + '/' + _cmdMap[fstr]
             let sourceStr = String(_fs.readFileSync(path))
             console.log(sourceStr)
-            // await setCbText(sourceStr)
         }
     } else if (/^-\d*$/.test(fstr)) {
         let name = _cmdMap[String(Number(fstr) * -1)]
@@ -895,7 +862,6 @@ async function dealKeyword(str, strs, fstr, ostr) {
                 if (_fs.existsSync(sFile)) {
                     let sourceStr = String(_fs.readFileSync(sFile))
                     console.log(sourceStr)
-                    // await setCbText(sourceStr)
                 }
             } else {
                 warn('require config.jsLibSource')
@@ -960,6 +926,15 @@ async function dealKeyword(str, strs, fstr, ostr) {
                 warn('require config.jsLibSource')
             }
         }
+    } else if (/^\^\d*$/.test(fstr)) {
+        let name = _cmdMap[trim(fstr.replace(/^\^/, ''))]
+        if (!name) {
+            warn("no items")
+        } else {
+            let md5Keys = getScriptRequires(name);
+            _cmdMap = filterCmd(md5Keys)
+            listCmd()
+        }
     } else if (/^e\d+$/.test(fstr)) {
         await runCmd(trim(str.substring(1)).replace(/^e/, ''))
     } else if (fstr === 'e' && ostr.length === 0) {
@@ -1003,6 +978,45 @@ async function dealKeyword(str, strs, fstr, ostr) {
     }
 }
 
+function getScriptMd5Map() {
+    let files = _fs.readdirSync(_home)
+    let md5Map = {}
+    for (let file of files) {
+        file = trim(file)
+        md5Map['0x' + md5(file).substr(0, 8)] = file;
+    }
+    return md5Map
+}
+
+function _getScriptRequires(md5Map, scriptName, md5Keys, links) {
+    let path = _home + '/' + scriptName;
+    let text = String(_fs.readFileSync(path))
+    let temp = []
+    regEach(text, /(0x[0-9a-f]{8})/g, r=> {
+        temp.push(r[1])
+    });
+    temp = [...new Set(temp)]
+    temp = temp.filter(i => {
+        let have = md5Map[i];
+        if (have && links.indexOf(i) !== -1) {
+            let items = [...links, i];
+            let errorStr = items.map(item => item === i ? warnStr(item):item).join("->")
+            throw `circle deps: ${errorStr}`
+        }
+        return have;
+    })
+    md5Keys.push(...temp)
+    for (let md5Key of temp) {
+        _getScriptRequires(md5Map, md5Map[md5Key], md5Keys, [...links, md5Key])
+    }
+}
+
+function getScriptRequires(scriptName) {
+    let md5Keys = [];
+    _getScriptRequires(getScriptMd5Map(), scriptName, md5Keys, ['0x' + md5(scriptName).substr(0, 8)]);
+    return md5Keys
+}
+
 function getComments(cmdName, text, cols = [], col) {
     let docLines = [infoStr('0x' + md5(cmdName).substr(0, 8))]
     text = trim(text)
@@ -1194,7 +1208,7 @@ async function runCmd(str = '', scriptName = '', text = '') {
         if (pair[1]) {
             pair[1] = trim(pair[1])
         }
-        if (pair[0] && !argDef.hasOwnProperty(pair[0])) {
+        if (pair[0] && argNames.indexOf(pair[0]) === -1) {
             throw 'invalid argName ' + pair[0]
         }
         pair[1] = needTrans ? await evalText( 'return ' + pair[1]):pair[1]
@@ -1205,7 +1219,7 @@ async function runCmd(str = '', scriptName = '', text = '') {
         if (argNames[curIdx]) {
             scriptArgs[argNames[curIdx]] = pair[1]
         }
-        if (pair[0] && argDef.hasOwnProperty(pair[0])) {
+        if (pair[0] && argNames.indexOf(pair[0]) !== -1) {
             delete scriptArgs[argNames[curIdx]]
             exactArgs[pair[0]] = pair[1]
         }
@@ -1214,6 +1228,7 @@ async function runCmd(str = '', scriptName = '', text = '') {
         scriptArgs[key] = exactArgs[key]
     }
     let exit = false
+    let scriptArgKeys = Object.keys(scriptArgs);
     for(let name of argNames) {
         let defStr = argDef[name]
         let beginIdx = defStr.indexOf("^");
@@ -1222,10 +1237,10 @@ async function runCmd(str = '', scriptName = '', text = '') {
         if (beginIdx !== -1 && endIdx !== -1 && beginIdx < endIdx) {
             reg = new RegExp(defStr.substring(beginIdx, endIdx + 1));
         }
-        if (name.startsWith("_") && !scriptArgs.hasOwnProperty(name)) {
+        if (name.startsWith("_") && scriptArgKeys.indexOf(name) === -1) {
             continue
         }
-        if (!scriptArgs.hasOwnProperty(name) || (reg && !reg.test(scriptArgs[name]))) {
+        if (scriptArgKeys.indexOf(name) === -1 || (reg && !reg.test(scriptArgs[name]))) {
             exit = true
             warn(`require ${warnStr(name)}` + (defStr ? ` <${defStr}>`:''))
         }
@@ -1275,9 +1290,15 @@ function getArgDef(text) {
     let argDef = {}
     try {
         argDef = eval(`(${exeStr || '{}'})`) || {}
+        let array = []
+        for (let key of Object.keys(argDef)) {
+            if (array.hasOwnProperty(key)) {
+                throw `invalid argName ${key}`
+            }
+        }
     } catch (e) {
         $log(errorStack(e))
-        argDef['[ParseError]'] = String(e)
+        argDef = {'[ParseError]': String(e)}
     }
     if (typeof argDef !== 'object') {
         argDef = {}
@@ -1376,6 +1397,24 @@ async function _requireSource(cmdMatchStr, ignoreLog = false) {
         }
         throw `invalid returned: ${cmdMatchStr}`
     }
+    if (typeof result === 'function') {
+        let tmp = result;
+        result = (...args) => {
+            let resp
+            try {
+                resp = tmp(...args)
+            } catch (e) {
+                throw _errorAppend(e, cmdName);
+            }
+            if (getType(resp) === 'Promise') {
+                return resp.catch(e => {
+                    return Promise.reject(_errorAppend(e, cmdName))
+                })
+            } else {
+                return resp;
+            }
+        }
+    }
     return result
 }
 
@@ -1400,6 +1439,18 @@ async function _requireSources(...matchItem) {
     return result
 }
 
+function _errorAppend(e, $cmdName) {
+    if (!$cmdName) {
+        return e;
+    }
+    if (!isError(e)) {
+        e = new Error(e)
+        e.stack = e.stack.split(/\n/)[0]
+    }
+    e.stack = e.stack + `\n    at ${$cmdName}`
+    return e
+}
+
 function evalText($text = '', $cmdName = '', $args = []) {
     const require = requireG;
     const $nextLine = nextLine;
@@ -1418,13 +1469,16 @@ function evalText($text = '', $cmdName = '', $args = []) {
     const $cmdMap = _cmdMap;
     const $defArgs = () => $args;
     const $require = _requireSources;
+    const $tableStr = tableStr;
+    const $nableStr = nableStr;
+    const $table = console.table;
+    const $nable = console.nable;
 
-    let code = `(async ()=>{try {${$text};
+    return eval(`(async ()=>{try {${$text};
     } catch(e) {
-        throw \`${$cmdName}${errorStr('->')}\` + (e ? (e.stack || e):e);
+        throw _errorAppend(e, $cmdName);
     }
-    })()`
-    return eval(code)
+    })()`)
 }
 
 process.on('uncaughtException',function(err){

package/ethWeb.js

@@ -80,6 +80,8 @@ async function ethBatchQuery(calls = [], web3, batchNum = 49, asyncNum = 33, use
                 for (let key of Object.keys(result)) {
                     if (/^\d+$/.test(key)) {
                         temp.push(result[key])
+                    } else {
+                        temp[key] = result[key]
                     }
                 }
                 return temp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "",
   "main": "index.js",
   "scripts": {

package/util.js

@@ -16,6 +16,8 @@ const crypto = require('crypto');
 const globalDirectories = require('global-dirs');
 const emptyFn = ()=>{}
 const dayJs = require('dayjs')
+const table = require('console.table')
+
 let _globalLog = createLimitLogger2(`${setting.name}.log`, null, false)
 global.$log = str => {
     str = trim(str)
@@ -47,7 +49,7 @@ global.$config = {
     localConfig: {},
     remoteConfig: {},
     getLocal: (key, defaultVal) => {
-        if (key && !$config.localConfig.hasOwnProperty(key)) {
+        if (key && Object.keys($config.localConfig).indexOf(key) === -1) {
             getConfig(key)
         }
         return getVl($config.localConfig[key], defaultVal)
@@ -85,6 +87,14 @@ async function _buildConfig() {
     $config._buildId = setTimeout(_buildConfig, 3000);
 }
 
+function tableStr(...args) {
+    return trim(table.getTable(...args))
+}
+
+function nableStr(rows) {
+    return tableStr(wrapRows(rows))
+}
+
 function timeStr(fmt, date) {
     return dayJs(date || new Date()).format(fmt || 'YYYY/MM/DD HH:mm:ss')
 }
@@ -93,6 +103,9 @@ function vl(obj) {
     if (typeof obj === 'number') {
         return !Number.isNaN(obj)
     }
+    if (typeof obj === 'string') {
+        obj = trim(obj)
+    }
     return !(obj === null || obj === undefined || obj === '')
 }
 
@@ -304,7 +317,16 @@ function requireG(module){
     return require(path);
 }
 
+function validStr(str, name) {
+    if (!vl(str) || typeof str !== 'string') {
+        throw "invalid cipher " + name;
+    }
+}
+
 function aesCipher(str, key){
+    validStr(str, "str");
+    validStr(key, "key");
+
     key = trim(key);
     if (!key || key.length > 16) {
         throw "aesCipher key length should between 1 and 16"
@@ -314,11 +336,14 @@ function aesCipher(str, key){
         return cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
     } catch(err) {
         $log(errorStack(err))
-        throw 'aesCipher failed'
+        throw 'aesCipher failed: ' + String(err)
     }
 }
 
 function aesDecipher(str, key){
+    validStr(str, "str");
+    validStr(key, "key");
+
     key = trim(key);
     if (!key || key.length > 16) {
         throw "aesCipher key length should between 1 and 16"
@@ -328,7 +353,7 @@ function aesDecipher(str, key){
         return decipher.update(str, 'hex', 'utf8') + decipher.final('utf8');
     } catch(err) {
         $log(errorStack(err))
-        throw 'aesDecipher failed'
+        throw 'aesDecipher failed: ' + String(err)
     }
 }
 
@@ -853,8 +878,8 @@ function warn(msg) {
     console.warn(warnStr('[warn]'), msg)
 }
 
-function error(e, msg) {
-    console.error(errorStr(`[${msg || 'error'}]`), e)
+function error(msg, tag) {
+    console.error(errorStr(`[${tag || 'error'}]`), msg)
 }
 
 function infoStr(str) {
@@ -910,6 +935,10 @@ function errorStack(e) {
     return String(e ? (e.stack || e):e)
 }
 
+function errorMsg(e) {
+    return trim(String(e).split("\n").map(trim).filter(i => i)[0])
+}
+
 function getType(obj) {
     if (obj === '') {
         return typeof obj;
@@ -1001,6 +1030,35 @@ async function batchAsync(fns = [], asyncNum = 1) {
     return await Promise.all(pros)
 }
 
+function objProfileRows(result) {
+    result = Object.keys(result).map(key => {
+        return {
+            key,
+            type: getType(result[key])
+        }})
+        .sort((a,b) => {
+            return a.type >= b.type ? 1:-1
+        })
+
+    let temp = []
+    for(let i = 0; i< Object.keys(result).length; i+=3) {
+        let item = {}
+        temp.push(item)
+
+        item['type'] = result[i].type
+        item['name']= result[i].key
+        if (result[i+1]) {
+            item['type '] = result[i+1].type
+            item['name ']= result[i+1].key
+        }
+        if (result[i+2]) {
+            item['type  '] = result[i+2].type
+            item['name  ']= result[i+2].key
+        }
+    }
+    return temp
+}
+
 module.exports = {
     run,
     reget,
@@ -1084,5 +1142,9 @@ module.exports = {
     batchAsync,
     ei,
     msg,
-    msgStr
+    msgStr,
+    errorMsg,
+    tableStr,
+    nableStr,
+    objProfileRows
 }