jsir 1.0.7 → 1.1.2

package/util.js

@@ -17,7 +17,7 @@ const globalDirectories = require('global-dirs');
 let md5 = require('md5');
 const emptyFn = ()=>{}
 const dayJs = require('dayjs')
-let _globalLog = createLimitLogger2(`${setting.name}.log`)
+let _globalLog = createLimitLogger2(`${setting.name}.log`, null, false)
 global.$log = str => {
     _globalLog(`[${timeStr()}] ${str}`)
 }
@@ -151,67 +151,101 @@ function appendLog(fileName, text) {
     fs.appendFile(logPath, text + '\n', emptyFn)
 }
 
-function createLimitLogger(fileName, maxChars) {
+function createLimitLogger(fileName, maxChars, logInfo = true) {
     let logDir = getLibDataDir() + "/log"
     mkdir(logDir)
     let logPath = logDir + "/" + fileName
     fileCleaner(logPath, maxChars)
+
+    if (logInfo) {
+        info(`log: ${logPath}`)
+    }
+
     return (text) => {
         fs.appendFile(logPath, String(text) + '\n', emptyFn)
     }
 }
 
-function createLimitLogger2(fileName, maxChars) {
+function createLimitLogger2(fileName, maxChars, logInfo = true) {
     let logDir = getLibDataDir() + "/log"
     mkdir(logDir)
     let logPath = logDir + "/" + fileName
     cleanFile(logPath, maxChars)
+
+    if (logInfo) {
+        info(`log: ${logPath}`)
+    }
+
+    let minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
     return (text) => {
-        if (Date.now()%(1000 * 60 * 10) === 0) {
+        let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
+        if (_minNum !== minNum) {
+            minNum = _minNum
             cleanFile(logPath, maxChars)
         }
         fs.appendFile(logPath, String(text) + '\n', emptyFn)
     }
 }
 
-function objDataFile(fileName, fn, fmt) {
+function textDataFile(fileName, fn) {
     let dataDir = getLibDataDir() + "/data"
     let path = dataDir + "/" + fileName
     if (!fs.existsSync(path)) {
         mkdir(dataDir)
-        fs.writeFileSync(path, "{}")
+        fs.writeFileSync(path, "")
     }
 
-    let obj = JSON.parse(String(fs.readFileSync(path)))
+    let text = String(fs.readFileSync(path))
     if (!fn) {
-        return obj
+        return text
     }
-    let val = fn(obj)
-    if (val && typeof val === 'object') {
-        obj = val
+    let val = fn(text)
+    if (vl(val) && val.constructor.name === 'Promise') {
+        return val.then(result => {
+            fileLock(fileName, () => fs.writeFileSync(path, result))
+            return result
+        })
+    } else {
+        fileLock(fileName, () => fs.writeFileSync(path, val))
+        return val
     }
-    fileLock(fileName, () => fs.writeFileSync(path, JSON.stringify(obj, null, fmt ? 2:null)))
-    return obj
 }
 
-async function objDataFileAsync(fileName, fn, fmt) {
+function objDataFile(fileName, fn, fmt) {
+    return dataFile(fileName, fn, fmt, {})
+}
+function arrayDataFile(fileName, fn, fmt) {
+    return dataFile(fileName, fn, fmt, [])
+}
+function dataFile(fileName, fn, fmt, defaultObj = {}) {
     let dataDir = getLibDataDir() + "/data"
     let path = dataDir + "/" + fileName
     if (!fs.existsSync(path)) {
         mkdir(dataDir)
-        fs.writeFileSync(path, "{}")
+        fs.writeFileSync(path, JSON.stringify(defaultObj, null, fmt ? 2:null))
     }
 
     let obj = JSON.parse(String(fs.readFileSync(path)))
     if (!fn) {
         return obj
     }
-    let val = await fn(obj)
-    if (val && typeof val === 'object') {
-        obj = val
+    let val = fn(obj)
+    if (vl(val) && val.constructor.name === 'Promise') {
+        return new Promise(async resolve => {
+            let result = await val
+            if (result && typeof result === 'object') {
+                obj = result
+            }
+            fileLock(fileName, () => fs.writeFileSync(path, 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)))
+        return obj
     }
-    fileLock(fileName, () => fs.writeFileSync(path, JSON.stringify(obj, null, fmt ? 2:null)))
-    return obj
 }
 
 function requireG(module){
@@ -398,33 +432,24 @@ function fileLock(key, fn) {
     } catch (e) {
         return;
     }
-    try {
-        fn()
-    } finally {
-        rmDir(file)
-    }
-}
 
-async function fileLockAsync(key, fn) {
-    if (!(fn && key)) {
-        return;
-    }
-    key = md5(trim(key))
-    let lockDir = getLibDataDir() + "/lock"
-    mkdir(lockDir)
-    let file = lockDir + "/" + key
-    if (fs.existsSync(file)) {
-        return;
-    }
+    let obj
     try {
-        fs.mkdirSync(file)
+        obj = fn()
     } catch (e) {
-        return;
+        rmDir(file)
     }
-    try {
-        await fn()
-    } finally {
+    if (obj && obj.constructor.name === 'Promise') {
+        return obj.then(result => {
+            rmDir(file)
+            return result
+        }).catch(e => {
+            rmDir(file)
+            throw e
+        })
+    } else {
         rmDir(file)
+        return obj
     }
 }
 
@@ -565,33 +590,34 @@ function linuxAskAndKill(...keys){
 }
 
 function timeLoop(fn, timestamp, lastIds = []){
+    let val
     try {
-        if (fn()) {
-            return;
-        }
+        val = fn()
     } catch (e) {
         console.error(e.toString().split("\n")[0])
         $log(e.stack)
     }
-    if (lastIds[0] !== false) {
-        lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
-    }
-    return lastIds
-}
+    if (vl(val) && val.constructor.name === 'Promise') {
+        return val.then(result => {
+            if (lastIds[0] !== false && result !== true) {
+                lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
+            }
+            return lastIds
+        }).catch(e => {
+            console.error(e.toString().split("\n")[0])
+            $log(e.stack)
 
-async function timeLoopAsync(fn, timestamp, lastIds = []){
-    try {
-        if (await fn()) {
-            return;
+            if (lastIds[0] !== false) {
+                lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
+            }
+            return lastIds
+        })
+    } else {
+        if (lastIds[0] !== false && val !== true) {
+            lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
         }
-    } catch (e) {
-        console.error(e.toString().split("\n")[0])
-        $log(e.stack)
-    }
-    if(lastIds[0] !== false) {
-        lastIds[0] = setTimeout(() => timeLoopAsync(fn, timestamp, lastIds), timestamp)
+        return lastIds
     }
-    return lastIds
 }
 
 function _linuxAskAndKill(rl, keys){
@@ -732,6 +758,68 @@ function getOrFn(obj, key, defaultValFn) {
     return obj[key]
 }
 
+function strEq(a, b) {
+    if (a === b) {
+        return true
+    }
+    if (!(vl(b) && vl(b))) {
+        return false
+    }
+    return String(a).toLowerCase() === String(b).toLowerCase()
+}
+
+function wrapRows(rows) {
+    let newRows = []
+    for(let row of rows) {
+        let temp = []
+        for(let key of Object.keys(row)) {
+            let val = row[key]
+            let items = String(val).split('\n')
+            for(let i = 0; i<items.length; i++) {
+                let r = getOr(temp, i, {})
+                r[key] = items[i]
+            }
+        }
+        newRows.push(...temp)
+    }
+    return newRows
+}
+
+function info(msg) {
+    process.stdout.write('\x1B[32m')
+    process.stdout.write('[info] ')
+    process.stdout.write('\x1B[39m')
+    console.log(msg)
+}
+
+function warn(msg) {
+    process.stdout.write('\x1B[33m')
+    process.stdout.write('[warn] ')
+    process.stdout.write('\x1B[39m')
+    console.log(msg)
+}
+
+function error(e, msg) {
+    process.stdout.write('\x1B[35m')
+    process.stdout.write(`[${msg || 'error'}] `)
+    process.stdout.write('\x1B[39m')
+    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,
@@ -762,7 +850,6 @@ module.exports = {
     requireG,
     toBigNum,
     objDataFile,
-    objDataFileAsync,
     appendLog,
     createLimitLogger,
     clearConsole,
@@ -770,7 +857,6 @@ module.exports = {
     globalLock,
     globalUnLock,
     rmDir,
-    fileLockAsync,
     eFn,
     removeFirst,
     sleep,
@@ -786,7 +872,6 @@ module.exports = {
     timeStr,
     splitArray,
     BigNumber,
-    timeLoopAsync,
     range,
     Range,
     getOr,
@@ -797,5 +882,14 @@ module.exports = {
     getOrFn,
     emptyFn,
     setConfig,
-    axios
+    axios,
+    textDataFile,
+    arrayDataFile,
+    dataFile,
+    strEq,
+    wrapRows,
+    info,
+    warn,
+    error,
+    parseSteps
 }