jsir 1.2.7 → 1.2.8

package/cmd/cleanLog.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 let fs = require('fs')
-let {ee, fileCleaner, trim, getLibDataDir, lisPid, timeLoop} = require('../index')
+let {ee, fileCleaner, trim, getLibDataDir, lisPid, timeLoop} = require('../util')
 let home = getLibDataDir()
 let cleanConfig = home + '/cleanLog.config'
 let cleanLogPath = home + '/cleanLog.log'

package/cmd/configServer.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
-let {$config, run} = require('../index')
+let {$config, run, lisPid} = require('../util')
 
 const server = require('server');
 let address = require('address');
 const { get } = server.router;
 const {send} = server.reply
-let {lisPid} = require('../index')
 
 let port = Number(process.argv[2] || 9563 )
 let router = [

package/cmd/dirServer.js

@@ -6,7 +6,7 @@ let mine=require('../source/mine').types;
 let path=require('path');
 let address = require('address');
 let urlencode = require('urlencode');
-let {lisPid} = require('../index')
+let {lisPid} = require('../util')
 
 let server = http.createServer(function (request, response) {
     let pathname = urlencode.decode(url.parse(request.url).pathname, "utf8");

package/cmd/ethDataServer.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-let {getPrice, eFn} = require('../index')
+let {getPrice, eFn, lisPid} = require('../util')
 let Web3 = require('web3');
 let web3 = new Web3("https://http-mainnet-node.huobichain.com");
 web3.eth.transactionPollingTimeout = 49
@@ -11,8 +11,6 @@ let usdt = '0xa71edc38d189767582c38a3145b5873052c3e47a'
 let wht = '0x5545153ccfca01fbd7dd11c0b23ba694d9509a6f'
 let mdxFact = '0xb0b670fc1F7724119963018DB0BfA86aDb22d941'
 
-let {lisPid} = require('../index')
-
 const { get } = server.router;
 let port = 9589
 
@@ -44,7 +42,7 @@ async function refreshData() {
         data.htPrice = await getPrice(wht, usdt, mdxFact);
         await refreshGasList()
     } catch (e) {
-        console.log(e.toString().split("\n")[0])
+        console.log(String(e))
     } finally {
         let cost = Date.now() - time
         console.log('Refresh Data Cost: ' + cost)

package/cmd/ethPrivateHit.js

@@ -4,7 +4,7 @@ if (!process.argv[2]) {
     return
 }
 
-let {run, web3BatchReq, trim, createLimitLogger2, lisPid, timeStr, sleep, getOrFn} = require('../index')
+let {run, web3BatchReq, trim, createLimitLogger2, lisPid, timeStr, sleep, getOrFn} = {...require('../util'), ...require('../ethWeb')}
 const Web3 = require("web3");
 let randomHex = require('randomhex');
 

package/cmd/mockServer.js

@@ -2,7 +2,7 @@
 let fs = require('fs')
 const server = require('server');
 let address = require('address');
-let {lisPid, getLibDataDir, trim, fileCleaner, getCbText} = require('../index')
+let {lisPid, getLibDataDir, trim, fileCleaner, getCbText} = require('../util')
 let libRoot = getLibDataDir()
 let home = libRoot + '/mock'
 let readline = require('readline')
@@ -96,7 +96,7 @@ function start() {
                 return ((typeof ctx.return === 'object') ? ctx.return : String(ctx.return)) || {}
             } catch (e) {
                 log(e)
-                return e.toString()
+                return String(e)
             }
         }
         let url = item.replace(/_-sep-_/g, '/')