jsir 1.2.9 → 1.3.1

package/evalCode.js

@@ -0,0 +1,14 @@
+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,
+    importG: $import} = require("./util");
+require = require("./util").requireG;
+module.exports = async ($text = '', $cmdName = '', $args = [],
+                        $cmdDir, $cmdMap, $require, $data,
+                        $nextLine, $nextText, $setTips, $delTips,
+                        $enter, $filterCmd) => {
+    const $defArgs = () => $args;
+    return await eval(`(async ()=>{${$text};
+    })()`)
+}

package/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsir",
-  "version": "1.2.9",
-  "description": "",
+  "version": "1.3.1",
+  "description": "js script manager tool",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -14,7 +14,6 @@
     "jsir-scd": "cmd/solCd.js",
     "jsir-stt": "cmd/solTt.js",
     "jsir-cleanLog": "cmd/cleanLog.js",
-    "jsir-ethPrivateHit": "cmd/ethPrivateHit.js",
     "jsir-staticServer": "cmd/staticServer.js",
     "jsir-dirServer": "cmd/dirServer.js",
     "jsir-stop": "cmd/stop.js",
@@ -40,9 +39,7 @@
     "ethers": "^5.1.0",
     "global-dirs": "^3.0.0",
     "keccak": "^3.0.2",
-    "md5": "^2.3.0",
     "pad": "^3.2.0",
-    "randomhex": "^0.1.5",
     "server": "^1.0.30",
     "urlencode": "^1.1.0",
     "web3": "^1.6.1",

package/util.js

@@ -17,6 +17,7 @@ const globalDirectories = require('global-dirs');
 const emptyFn = ()=>{}
 const dayJs = require('dayjs')
 const table = require('console.table')
+const _fs = require("fs");
 
 let _globalLog = createLimitLogger2(`${setting.name}.log`, null, false)
 global.$log = str => {
@@ -28,7 +29,10 @@ global.$log = str => {
 const $log = global.$log
 let _globalDraft= createLimitLogger2(`draft.log`, null, false)
 global.$draft = str => {
-    if (trim(str)) {
+    if (getType(str) === 'RegExp') {
+        let results = draftQuery(trim(str.source))
+        return results.map(i => i.split(/\n/).slice(1).join('\n'))
+    } else if (trim(str)) {
         _globalDraft(`---------${timeStr()}\n${str.split("\n").filter(i => trim(i)).join("\n")}`)
     }
 }
@@ -87,13 +91,88 @@ async function _buildConfig() {
     $config._buildId = setTimeout(_buildConfig, 3000);
 }
 
+function isArgsMatch(text, args, callback, useMd5) {
+    let match = false
+    for (let arg of args) {
+        let r = true
+        for (let str of arg.split(',').filter(item => trim(item) !== '')) {
+            let reg = new RegExp(str, 'i')
+            if (!reg.test(text) && !(useMd5 && ('0x' + md5(text).substr(0, 8)) === str)) {
+                r = false
+                break
+            }
+        }
+        if (r) {
+            match = true
+            break
+        }
+    }
+    if (match && callback) {
+        callback()
+    }
+    return match
+}
+
+function draftQuery(fLine) {
+    let lines = []
+    let text = String(_fs.readFileSync(getLibDataDir() + "/log/draft.log"))
+    let temp = []
+    for (let line of text.split("\n")) {
+        if (!trim(line)) {
+            continue
+        }
+        if (line.startsWith("---------")) {
+            if (temp.length > 0) {
+                lines.push(temp.join('\n'))
+            }
+            temp = []
+            temp.push(warnStr(line))
+        } else {
+            temp.push(line)
+        }
+    }
+    if (temp.length > 0) {
+        lines.push(temp.join('\n'))
+    }
+
+    let results = []
+    if (!/^\d+$/.test(fLine)) {
+        let items = fLine.split(/\s+/).filter(i => i)
+        for (let line of lines) {
+            if (isArgsMatch(line, items.filter(item => !/^\d+$/.test(item)))) {
+                results.push(line)
+            }
+        }
+
+        lines = results
+        results = []
+
+        let nums = items.filter(item => /^\d+$/.test(item))
+        if (nums.length > 0) {
+            fLine = nums[nums.length - 1]
+        } else {
+            fLine = lines.length
+        }
+    }
+    if (fLine && /^\d+$/.test(fLine)) {
+        let index = Math.abs(parseInt(fLine));
+        results.push(...lines.slice(- index))
+    }
+    return results
+}
+
 function tableStr(...args) {
     return trim(table.getTable(...args))
 }
-
 function nableStr(rows) {
     return tableStr(wrapRows(rows))
 }
+console.table = (...args) => {
+    console.log(tableStr(...args))
+}
+console.nable = (rows) => {
+    console.log(nableStr(rows))
+}
 
 function timeStr(fmt, date) {
     return dayJs(date || new Date()).format(fmt || 'YYYY/MM/DD HH:mm:ss')
@@ -117,8 +196,8 @@ function getVl(...obj) {
     }
 }
 
-let cacheFnResp;
-async function cacheFn(key, fn, validMs, awaitRefresh) {
+const cacheFnRespMap = {};
+async function cacheFn(key, fn, validMs, awaitRefresh = true) {
     getOr($fnCache, key, {
         validMsTime: 0
     });
@@ -126,20 +205,12 @@ async function cacheFn(key, fn, validMs, awaitRefresh) {
         // do nothing
     } else {
         $fnCache[key].validMsTime = Date.now() * 3;
-        let sync = true
-        cacheFnResp =  (async () => {
+        cacheFnRespMap[key] = (async () => {
             let val;
             try {
                 val = await fn()
             } finally {
-                if (!$fnCache[key].validMsTime > Date.now() * 2) {
-                    sync = false
-                } else {
-                    $fnCache[key].validMsTime = 0
-                }
-            }
-            if (!sync) {
-                return;
+                $fnCache[key].validMsTime = 0
             }
             $fnCache[key] = {
                 val,
@@ -149,7 +220,7 @@ async function cacheFn(key, fn, validMs, awaitRefresh) {
         })();
     }
     if (awaitRefresh || !$fnCache[key].valInit) {
-        await cacheFnResp;
+        await cacheFnRespMap[key];
     }
     return $fnCache[key].val
 }
@@ -238,49 +309,52 @@ function createLimitLogger2(fileName, maxChars, logInfo = true) {
     }
 }
 
-function textDataFile(fileName, fn) {
-    let dataDir = getLibDataDir() + "/data"
-    let path = dataDir + "/" + fileName
-    if (!fs.existsSync(path)) {
-        mkdir(dataDir)
-        fs.writeFileSync(path, "")
-    }
-
-    let text = String(fs.readFileSync(path))
-    if (!fn) {
-        return text
-    }
-    let val = fn(text)
-    if (vl(val) && getType(val) === 'Promise') {
-        return val.then(result => {
-            if (vl(result) || String(result) === '') {
-                fileLock(fileName, () => fs.writeFileSync(path, result))
-            }
-            return result
-        })
-    } else {
-        if (vl(val) || String(val) === '') {
-            fileLock(fileName, () => fs.writeFileSync(path, val))
-        }
-        return val
-    }
-}
-
 function objDataFile(fileName, fn, fmt) {
+    fileName = trim(fileName)
     return dataFile(fileName, fn, fmt, {})
 }
 function arrayDataFile(fileName, fn, fmt) {
+    fileName = trim(fileName)
     return dataFile(fileName, fn, fmt, [])
 }
-function dataFile(fileName, fn, fmt, defaultObj = {}) {
+function iobjDataFile(fileName, fn, fmt) {
+    return dataFile(getInitName(fileName), fn, fmt, {}, true)
+}
+function iarrayDataFile(fileName, fn, fmt) {
+    return dataFile(getInitName(fileName), fn, fmt, [], true)
+}
+function getInitName(fileName) {
+    fileName = trim(fileName)
+    let ooaDir = getLibDataDir() + "/ooa"
+    if (!fileName.startsWith("/")) {
+        fileName = 'i ' + fileName.replace(/i\s+/, '')
+        if (!/\..+/.test(fileName)) {
+            fileName = fileName + '.js'
+        }
+        fileName = ooaDir + '/' + fileName
+    }
+    return fileName;
+}
+function dataFile(fileName, fn, fmt, defaultObj = {}, returnStr = false) {
     let dataDir = getLibDataDir() + "/data"
-    let path = dataDir + "/" + fileName
+    fileName = trim(fileName)
+    let path
+    if (fileName.startsWith("/")) {
+        path = fileName
+    } else {
+        path = dataDir + "/" + fileName
+    }
+    let prefixStr = returnStr ? 'return ' : '';
     if (!fs.existsSync(path)) {
         mkdir(dataDir)
-        fs.writeFileSync(path, JSON.stringify(defaultObj, null, fmt ? 2:null))
+        fs.writeFileSync(path, prefixStr + JSON.stringify(defaultObj, null, fmt ? 2:null))
     }
 
-    let obj = JSON.parse(String(fs.readFileSync(path)))
+    let text = String(fs.readFileSync(path));
+    if (returnStr) {
+        text = text.replace(/return\s+/, '')
+    }
+    let obj = JSON.parse(text)
     if (!fn) {
         return obj
     }
@@ -291,14 +365,14 @@ function dataFile(fileName, fn, fmt, defaultObj = {}) {
             if (result && typeof result === 'object') {
                 obj = result
             }
-            fileLock(fileName, () => fs.writeFileSync(path, JSON.stringify(obj, null, fmt ? 2:null)))
+            fileLock(fileName, () => fs.writeFileSync(path, prefixStr + JSON.stringify(obj, null, fmt ? 2:null)))
             resolve(obj)
         })
     } else {
         if (val && typeof val === 'object') {
             obj = val
         }
-        fileLock(fileName, () => fs.writeFileSync(path, JSON.stringify(obj, null, fmt ? 2:null)))
+        fileLock(fileName, () => fs.writeFileSync(path, prefixStr + JSON.stringify(obj, null, fmt ? 2:null)))
         return obj
     }
 }
@@ -317,6 +391,20 @@ function requireG(module){
     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 + '/index.js';
+    if (!fs.existsSync(path)) {
+        throw `ERROR: ${module} not found, use [npm install -g ${module}] to install it`;
+    }
+    return await import(path);
+}
+
 function validStr(str, name) {
     if (!vl(str) || typeof str !== 'string') {
         throw "invalid cipher " + name;
@@ -855,6 +943,9 @@ function wrapRows(rows) {
         let temp = []
         for(let key of Object.keys(row)) {
             let val = row[key]
+            if (getType(val) !== "String") {
+                val = JSON.stringify(val, null, 2)
+            }
             let items = String(val).split('\n')
             for(let i = 0; i<items.length; i++) {
                 let r = getOr(temp, i, {})
@@ -867,18 +958,30 @@ function wrapRows(rows) {
 }
 
 function info(msg) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = infoStr(msg)
+    }
     console.log(infoStr('[info]'), msg)
 }
 
 function msg(msg) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = msgStr(msg)
+    }
     console.log(msgStr('[msg]'), msg)
 }
 
 function warn(msg) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = warnStr(msg)
+    }
     console.warn(warnStr('[warn]'), msg)
 }
 
 function error(msg, tag) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = errorStr(msg)
+    }
     console.error(errorStr(`[${tag || 'error'}]`), msg)
 }
 
@@ -941,7 +1044,7 @@ function errorMsg(e) {
 
 function getType(obj) {
     if (obj === '') {
-        return typeof obj;
+        return 'String';
     }
     if (!vl(obj)) {
         return String(obj)
@@ -1059,6 +1162,18 @@ function objProfileRows(result) {
     return temp
 }
 
+function errorTag(e, tag) {
+    if (!tag) {
+        return e;
+    }
+    if (!isError(e)) {
+        e = new Error(e)
+        e.stack = e.stack.split(/\n/)[0]
+    }
+    e.stack = e.stack + `\n    at ${tag}`
+    return e
+}
+
 module.exports = {
     run,
     reget,
@@ -1122,7 +1237,6 @@ module.exports = {
     emptyFn,
     setConfig,
     axios,
-    textDataFile,
     arrayDataFile,
     dataFile,
     strEq,
@@ -1146,5 +1260,11 @@ module.exports = {
     errorMsg,
     tableStr,
     nableStr,
-    objProfileRows
+    objProfileRows,
+    errorTag,
+    iobjDataFile,
+    iarrayDataFile,
+    isArgsMatch,
+    draftQuery,
+    importG
 }

package/cmd/ethPrivateHit.js

@@ -1,64 +0,0 @@
-#!/usr/bin/env node
-if (!process.argv[2]) {
-    console.log("web3 http provider required")
-    return
-}
-
-let {run, web3BatchReq, trim, createLimitLogger2, lisPid, timeStr, sleep, getOrFn} = {...require('../util'), ...require('../ethWeb')}
-const Web3 = require("web3");
-let randomHex = require('randomhex');
-
-let accountLog = createLimitLogger2('ethPrivateHit.account')
-let recordLog = createLimitLogger2('ethPrivateHit.log')
-let batchNum = 365
-lisPid(`ethPrivateHit`)
-let web3Map = {}
-let web3 = new Web3()
-
-run(async ()=>{
-    let trys = 1
-    while (true) {
-        await sleep(1)
-        try {
-            let accounts = []
-            for(let i = 0; i<batchNum; i++) {
-                accounts.push(web3.eth.accounts.privateKeyToAccount(randomHex(32)))
-            }
-            for(let url of process.argv.slice(2)) {
-                let web3Obj = getOrFn(web3Map, url, () => {
-                    return {web3: new Web3(trim(url))}
-                })
-                if (!web3Obj.chainId) {
-                    web3Obj.chainId = await web3Obj.web3.eth.getChainId()
-                }
-                await processChain(accounts, web3Obj.web3, web3Obj.chainId, trys)
-            }
-            trys ++
-        } catch (e) {
-            recordLog(e)
-        }
-    }
-})
-
-async function processChain(accounts, web3, chainId, trys) {
-    let calls = []
-    for(let account of accounts) {
-        calls.push({
-            method: web3.eth.getBalance,
-            args: [account.address],
-            callback: (error, bal) => {
-                if (error) {
-                    recordLog(error)
-                    return
-                }
-                if (bal > 0) {
-                    account.balance = bal
-                    account.chainId = chainId
-                    accountLog(`account: ${JSON.stringify(account, null, 2)}`)
-                }
-            }
-        })
-    }
-    await web3BatchReq(calls, 49, 9, web3)
-    recordLog(`${timeStr()}: ${chainId} ${trys * batchNum}`)
-}