jsir 1.2.4 → 1.2.7

package/cmd/ooa.js

@@ -322,7 +322,7 @@ async function dealInitData() {
         try {
             $i[initDataName] = await evalText(text)
         } catch (e) {
-            $log(`$i.${initDataName} loading failed\n${e.stack}`);
+            $log(`$i.${initDataName} loading failed\n${e.stack || e}`);
         }
         if (!vl($i[initDataName])) {
             warn(`$i.${initDataName} loading failed`)
@@ -1019,16 +1019,24 @@ function getArgComments(argDef) {
     return comments
 }
 
-async function runCmd(str) {
+async function runCmd(str, scriptName) {
+    if (scriptName) {
+        str = `0 ${str}`
+    }
     let strs = str.split(/\s+/)
-    if (!_cmdMap[strs[0]] && strs[0] !== '0') {
-        warn('no items')
-        _noAppendNextLine || nextLine()
-        return
+    if (!scriptName) {
+        if (!_cmdMap[strs[0]] && strs[0] !== '0') {
+            warn('no items')
+            _noAppendNextLine || nextLine()
+            return
+        }
+        if (_cmdMap[strs[0]]) {
+            scriptName = _cmdMap[strs[0]];
+        }
     }
 
-    let path = _home + '/' + _cmdMap[strs[0]]
-    let text = _cmdMap[strs[0]] ? String(_fs.readFileSync(path)) : await getCbText()
+    let path = _home + '/' + scriptName
+    let text = scriptName ? String(_fs.readFileSync(path)) : await getCbText()
 
     let args = enrichArgs(str, text)
     let argDef = getArgDef(text)
@@ -1036,7 +1044,7 @@ async function runCmd(str) {
     let exactArg = {}
     for (let i = 0; i<args.length; i++) {
         let arg = args[i]
-        let pair = arg.split('=', 2).map(i => trim(i))
+        let pair = arg.indexOf('=') === -1 ? [] : arg.split('=', 2).map(i => trim(i))
         let argVal = argDef.hasOwnProperty(pair[0]) ? pair[1]:arg
         argVal = translateArgs(argVal)
 
@@ -1073,7 +1081,7 @@ async function runCmd(str) {
 
     process.argv = [process.argv[0], path, ...args]
     try {
-        await evalText(text, strs[0], _cmdMap[strs[0]], args)
+        return await evalText(text, strs[0], _cmdMap[strs[0]], args)
     } catch (e) {
         error(e)
     }

package/ethWeb.js

@@ -1,7 +1,7 @@
 const https = require('https');
 const BigNumber = require('bignumber.js');
-let {mkdir, getLibDataDir, trim, got, toBigNum, getConfig, objDataFile,
-    eFn, removeFirst, randomInt, splitArray, sleep, vl, cacheFn, isError, bMin} = require('./util')
+let {getLibDataDir, trim, toBigNum, getConfig, objDataFile,
+    eFn, removeFirst, randomInt, splitArray, sleep, vl, cacheFn, isError, bMin, getOr} = require('./util')
 const abiDecoder = require('abi-decoder');
 let fs = require('fs')
 let contractMapPath = getLibDataDir() + "/contractMap.json"
@@ -511,31 +511,31 @@ function getPairAmtNoFee(a, b, baseAmt) {
 }
 
 let tokenMapLoaded = {}
+let tokenMapLoadSize = {}
 async function saveTokenMap(web3) {
     web3 = web3 || global.web3;
     let chainId = global.chainId || await web3.getChainId()
-    if (!tokenMapCache[chainId]) {
-        tokenMapCache[chainId] = {}
-    }
-    let chainMap = tokenMapCache[chainId]
+    let chainMap = getOr(tokenMapCache, chainId, {})
     let tokenMapFile = `tokenMap_${chainId}`
     if (!tokenMapLoaded[chainId]) {
-        Object.assign(chainMap, objDataFile(tokenMapFile))
+        let temp = objDataFile(tokenMapFile)
+        tokenMapLoadSize[chainId] = Object.keys(temp).length
+        Object.assign(chainMap, temp)
         tokenMapLoaded[chainId] = true
     }
-    objDataFile(tokenMapFile, () => chainMap);
+    if (Object.keys(chainMap).length > tokenMapLoadSize[chainId]) {
+        await objDataFile(tokenMapFile, () => chainMap);
+    }
 }
 async function getTokenMap(tokens, web3, batchNum, asyncNum) {
     web3 = web3 || global.web3;
     let chainId = global.chainId || await web3.getChainId()
-    if (!tokenMapCache[chainId]) {
-        tokenMapCache[chainId] = {}
-    }
-    let chainMap = tokenMapCache[chainId]
-
+    let chainMap = getOr(tokenMapCache, chainId, {})
     if (!tokenMapLoaded[chainId]) {
         let tokenMapFile = `tokenMap_${chainId}`
-        Object.assign(chainMap, objDataFile(tokenMapFile))
+        let temp = objDataFile(tokenMapFile)
+        tokenMapLoadSize[chainId] = Object.keys(temp).length
+        Object.assign(chainMap, temp)
         tokenMapLoaded[chainId] = true
     }
 

package/package.json

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