jsir 1.1.1 → 1.1.6

package/cmd/ooa.js

@@ -21,7 +21,7 @@ const _setting = require('../setting')
 let _cmdMap = {}
 let _rl
 let _haveWrapperInput = false
-let _haveStartRead = false;
+let _haveStartRead = false
 let _repos = arrayDataFile('repos.json')
 
 const lib = require('../index')
@@ -133,7 +133,7 @@ run(async () => {
 
         if (['run', 'edit', 'rm', 'diff', 'push', 'pull'].indexOf(_args[0]) !== -1
             && _args[1] && !/^\d+$/.test(_args[1])) {
-            let name = `e ${_args[1]}.js`
+            let name = toJsirFileName(`e ${_args[1]}`)
             let path = _home + '/' + name
             if (_fs.existsSync(path)) {
                 _cmdMap = {
@@ -204,7 +204,7 @@ async function fileLine(name) {
     }
     let tempDir = getLibDataDir() + "/ooa"
     mkdir(tempDir)
-    let workFile = `${tempDir}/f ${name}.js`;
+    let workFile = `${tempDir}/f ${toJsirFileName(name)}`;
     if (!_fs.existsSync(workFile)) {
         _fs.writeFileSync(workFile, '');
     }
@@ -228,9 +228,7 @@ async function fileLine(name) {
                 && newLines.length >= lines.length
                 && newLine !== line) {
                 let exeStrs
-                if (newLine.startsWith("//")) {
-                    exeStrs = []
-                } else if (newLine.startsWith('/*')) {
+                if (newLine.startsWith('/*')) {
                     exeStrs = newLine.replace(/^\/\*|\*\/$/g, '').split('\n')
                         .map(i => trim(trim(i).replace(/^\*/, '')))
                         .filter(i => i)
@@ -271,21 +269,15 @@ function getLines(text) {
             continue
         }
 
-        if (line.startsWith('//')) {
+        if (line.startsWith('/*')) {
             if (cLine.length > 0) {
                 lines.push(cLine.join('\n'))
                 cLine = []
             }
-            lines.push(line)
-            continue
-        }
 
-        if (line.startsWith('/*')) {
-            if (cLine.length > 0) {
-                lines.push(cLine.join('\n'))
-                cLine = []
+            if (!line.endsWith('*/')) {
+                nLine.push(line)
             }
-            nLine.push(line)
             continue
         }
 
@@ -307,8 +299,7 @@ async function dealInitData() {
             continue;
         }
         let filePath = _home + "/" + file;
-        let initDataName = file.replace(/^i\s+/, '')
-            .replace(/\.js$/, '')
+        let initDataName = trimJsirFileName(file.replace(/^i\s+/, ''))
             .split(/\s+/).filter(item => item).join("_");
         let text = String(_fs.readFileSync(filePath))
         $i[initDataName] = null
@@ -354,7 +345,7 @@ function _nextLine(callback, preStr, hidden, resolve) {
     _rl.on('line', async line => {
         line = trim(line)
         _haveWrapperInput = true;
-        if (hidden || (callback && callback !== wrapperInput)) {
+        if (line && (hidden || (callback && callback !== wrapperInput))) {
             _rl.history = _rl.history.slice(1)
         }
         if (_noAppendNextLine && _rl) {
@@ -408,7 +399,7 @@ function dealSourceCmds() {
         mkdir(source)
     }
     if (source && _fs.existsSync(source)) {
-        _fs.readdirSync(source).filter(item => item.endsWith('.js')).forEach(item => {
+        _fs.readdirSync(source).filter(isJsirFileName).forEach(item => {
             if (!_fs.existsSync(_home + "/" + item)) {
                 _fs.writeFileSync(_home + "/" + item, String(_fs.readFileSync(source + "/" + item)))
             }
@@ -419,7 +410,7 @@ function dealSourceCmds() {
 }
 
 async function save(args) {
-    let path = `${_home}/${args.join(' ')}.js`
+    let path = `${_home}/${toJsirFileName(args.join(' '))}`
     if (_fs.existsSync(path)) {
         warn('already exist')
         return
@@ -508,11 +499,12 @@ function listCmd() {
 
             text = text1
         }
-        let name = _cmdMap[i].replace(/\.js$/, '')
+        let name = trimJsirFileName(_cmdMap[i])
+        let suffix = getJsirFileSuffix(_cmdMap[i])
         let item = {
             key: prefix.join('') + i,
-            type: _types[name.split(/\s+/)[0]] || 'note',
-            name: name.replace(/^[eif]\s+/, '')
+            name: name.replace(/^[eif]\s+/, ''),
+            type: [_types[name.split(/\s+/)[0]] || 'note', suffix].map(trim).join(".")
         }
         items.push(item)
 
@@ -558,6 +550,7 @@ function printObjProfile(result) {
 }
 
 async function wrapperInput(str) {
+    _haveWrapperInput = true;
     global.$newInput = true;
 
     str = trim(str)
@@ -657,7 +650,7 @@ async function wrapperInput(str) {
         if (_cmdMap[strs[0]]) {
             putHis(_cmdMap[strs[0]])
             let path = _home + '/' + _cmdMap[strs[0]]
-            let fileName = _cmdMap[strs[0]].replace(/\.js$/, '');
+            let fileName = trimJsirFileName(_cmdMap[strs[0]]);
             let firstName = trim(fileName).split(/\s+/)[0]
             if (firstName === 'f') {
                 await fileLine(fileName.replace(/^\s*f\s*/, ''))
@@ -735,7 +728,7 @@ async function dealKeyword(str, strs, fstr, ostr) {
         } else {
             let newName =trim(ostr.join(" "))
             if (newName) {
-                newName = newName + ".js"
+                newName = toJsirFileName(newName)
                 if (rename(_home + '/' + name, _home + '/' + newName)) {
                     info(`${_home + '/' + newName} renamed`)
                 }
@@ -838,7 +831,6 @@ async function dealKeyword(str, strs, fstr, ostr) {
     }
 }
 
-
 function getComments(text, cols = [], col) {
     let docLines = []
     text = trim(text)
@@ -873,16 +865,49 @@ function getComments(text, cols = [], col) {
     }
 }
 
+function toJsirFileName(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return name;
+    }
+    name = name + '.js'
+    if (!isJsirFileName(name)) {
+        throw `invalid name`
+    }
+    return name
+}
+
+function isJsirFileName(name) {
+    name = trim(name)
+    return /^[^.]*[^.\s]\.[^.\s]+$/.test(name)
+}
+
+function trimJsirFileName(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return trim(name.replace(/\.[^.\s]+$/, ''))
+    }
+    return name
+}
+
+function getJsirFileSuffix(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return trim(name.split('.').slice(-1))
+    }
+    return ''
+}
+
 function filterCmd(args){
     let cmdMap = {}
     let files = _fs.readdirSync(_home)
     let i = 1
     for (let file of files) {
         file = trim(file)
-        let fileName = file.replace(/\.js$/, '')
-        if (!file.endsWith('.js') || !fileName) {
+        if (!isJsirFileName(file)) {
             continue
         }
+        let fileName = trimJsirFileName(file)
         isArgsMatch(fileName, args, () => {
             if (Object.values(cmdMap).indexOf(file) === -1) {
                 cmdMap[i] = file
@@ -1020,8 +1045,9 @@ function enrichArgs(str) {
         }
         i ++
     })
-    return args
+    return args.map(trim)
 }
+
 function translateArgs(arg) {
     let rpStr = s => {
         let ori = s;
@@ -1051,13 +1077,18 @@ function getArgDef(text) {
         argDef = {}
     }
     let temp = {}
+    let tempOpt = {}
     for (let key of Object.keys(argDef)) {
         let vlKey = trim(key)
         if (vlKey) {
-            temp[vlKey] = argDef[key]
+            if (vlKey.startsWith('_')) {
+                tempOpt[vlKey] = argDef[key]
+            } else {
+                temp[vlKey] = argDef[key]
+            }
         }
     }
-    return temp
+    return Object.assign(temp, tempOpt)
 }
 
 function setTips(key, value, onRm) {

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} = require('./util')
+    eFn, removeFirst, randomInt, splitArray, sleep, vl, cacheFn, isError, bMin} = require('./util')
 const abiDecoder = require('abi-decoder');
 let fs = require('fs')
 let contractMapPath = getLibDataDir() + "/contractMap.json"
@@ -500,7 +500,9 @@ async function getTokenMap(tokens, web3) {
     }
 
     tokens = tokens || []
-    tokens = tokens.filter(token => !chainMap[token]).map(token => '0x' + token.toLowerCase().replace(/^0x/, ''))
+    tokens = tokens.map(token => '0x' + token.toLowerCase().replace(/^0x/, ''))
+    tokens = [...new Set(tokens)]
+    tokens = tokens.filter(token => !chainMap[token])
     if (tokens.length <= 0) {
         return chainMap
     }
@@ -770,7 +772,7 @@ async function ethRead(address, abi, method, args, web3) {
 
 function createEthWrite(config = {}) {
     return async (sender, address, opt) => {
-        await ethWrite(sender, address, Object.assign(opt, config))
+        return await ethWrite(sender, address, Object.assign({}, config, opt))
     }
 }
 
@@ -804,13 +806,15 @@ async function ethWrite(sender, address, {data, abi, method, args, gasPrice, gas
     }
     console.log(`${msg} send ${signedTx.hash} ${txObject.gasPrice/1000000000}g`)
     result = result.then(resp => {
-        console.log(`${msg} ${signedTx.hash} 交易成功`)
+        console.log('\x1B[32m%s\x1B[39m', `${msg} ${signedTx.hash} 交易成功`)
+        return true
     }).catch(async e => {
-        console.log(`${msg} ${signedTx.hash} 交易失败`)
+        console.log('\x1B[35m%s\x1B[39m', `${msg} ${signedTx.hash} 交易失败`)
         if (onError) {
-            await onError(e)
+            return await onError(e)
         } else {
             console.error(e.toString().split("\n")[0])
+            return false
         }
     })
     if (waitConfirm) {
@@ -1000,7 +1004,7 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(fb) < max) {
                     continue
                 }
-                let transferAmt = String(max - Number(tb))
+                let transferAmt = bMin(max, tb)
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
                 pros.push(ethTranserWrite(sender, token, {
                     abi: erc20Abi,
@@ -1018,7 +1022,7 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(fb) < max) {
                     continue
                 }
-                let transferAmt = String(max - Number(tb))
+                let transferAmt = bMin(max, tb)
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
                 pros.push(ethTranserWrite(sender, toAddress, {
                     value: transferAmt,
@@ -1053,7 +1057,7 @@ async function batchCollect(ethTranserWrite, token, froms, to, remain) {
             if (Number(fb) <= remain) {
                 continue
             }
-            let transferAmt = Number(fb) - remain
+            let transferAmt = bMin(fb, remain)
             let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
             pros.push(ethTranserWrite(sender, token, {
                 abi: erc20Abi,
@@ -1067,7 +1071,7 @@ async function batchCollect(ethTranserWrite, token, froms, to, remain) {
             if (Number(fb) <= remain) {
                 continue
             }
-            let transferAmt = Number(fb) - remain
+            let transferAmt = bMin(fb, remain)
             let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
             pros.push(ethTranserWrite(sender, toAddress, {
                 value: transferAmt,
@@ -1145,13 +1149,33 @@ async function tokenApprove(ethWrite, sender, senderAddress, erc20, spender, opt
     let {amt = '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', msg} = opt
     let bal = await ethRead(erc20, erc20Abi, 'allowance', [senderAddress, spender])
     if (bal <Number(amt) ) {
-        await ethWrite(sender, erc20, {
+        return await ethWrite(sender, erc20, {
             abi: erc20Abi,
             method: 'approve',
             args: [spender, amt],
             msg
         })
     }
+
+    return {
+        promise: true
+    }
+}
+
+function txnInputReplacer(input, callback) {
+    let item = [input.substring(0, 10)]
+    input = input.substring(10, input.length)
+
+    let str = ''
+    while (input.length > 0) {
+        str = input.substring(0, 64);
+        input = input.substring(64, input.length);
+        if (callback) {
+            str = callback(str)
+        }
+        item.push(str)
+    }
+    return item.join('')
 }
 
 module.exports = {
@@ -1204,5 +1228,6 @@ module.exports = {
     fastSwapForExact,
     getTokenBal,
     transferToken,
-    tokenApprove
+    tokenApprove,
+    txnInputReplacer
 }

package/index.js

@@ -68,7 +68,8 @@ const {
     wrapRows,
     info,
     warn,
-    error
+    error,
+    parseSteps
 } = require('./util')
 const {
     sc,
@@ -127,7 +128,8 @@ const {
     fastSwapForExact,
     getTokenBal,
     transferToken,
-    tokenApprove
+    tokenApprove,
+    txnInputReplacer
 } = require('./ethWeb')
 
 module.exports = {
@@ -255,5 +257,7 @@ module.exports = {
     wrapRows,
     info,
     warn,
-    error
+    error,
+    txnInputReplacer,
+    parseSteps
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "1.1.1",
+  "version": "1.1.6",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,6 @@
     "abi-decoder": "^2.3.0",
     "address": "^1.1.2",
     "axios": "^0.20.0",
-    "better-sqlite3": "^7.4.3",
     "bignumber.js": "^9.0.0",
     "chokidar": "^3.5.2",
     "console.table": "^0.10.0",

package/util.js

@@ -806,6 +806,20 @@ function error(e, msg) {
     console.log(e)
 }
 
+function parseSteps(str) {
+    let items = str.split(',').map(trim).filter(i => i)
+    let result = []
+    for (let item of items) {
+        let ss = item.split('-').map(trim).filter(i => i)
+        if (ss.length > 1) {
+            result.push(...range(Number(ss[0]), Number(ss[1])))
+        } else {
+            result.push(Number(ss[0]))
+        }
+    }
+    return result
+}
+
 module.exports = {
     run,
     reget,
@@ -876,5 +890,6 @@ module.exports = {
     wrapRows,
     info,
     warn,
-    error
+    error,
+    parseSteps
 }

package/sql.js

@@ -1,11 +0,0 @@
-const {getLibDataDir, mkdir, createLimitLogger} = require('./util');
-const Database = require('better-sqlite3');
-let dataDir = getLibDataDir()
-let dbDir = dataDir + '/db'
-mkdir(dbDir)
-
-function getDb(name) {
-    let dbFile = dbDir + '/' + name
-    return new Database(dbFile, { verbose: createLimitLogger(name + '.dblog') });
-}
-