jsir 2.3.0 → 2.3.2

package/cmd/oaa.js

@@ -11,7 +11,7 @@ const {
     createConsole, setTips, delTips,
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
-    getOr, getAlias, wrapperJsirText, eia
+    getAlias, wrapperJsirText, eia
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -138,7 +138,7 @@ function getFileOpenExe(fileName) {
 
 function checkWorkspaces() {
     let localWorkspace = _libDataDir + '/local';
-    global.$workspaceMap = {
+    setting.workspaceMap = {
         'local': localWorkspace
     }
     mkdir(localWorkspace)
@@ -149,15 +149,15 @@ function checkWorkspaces() {
             continue
         }
         if (fs.existsSync(workspace)) {
-            $workspaceMap[space] = workspace;
+            setting.workspaceMap[space] = workspace;
         }
     }
-    arrayDataFile(_workspaceConfigFile, () => Object.values($workspaceMap))
-    initWorkspace()
+    arrayDataFile(_workspaceConfigFile, () => Object.values(setting.workspaceMap))
 }
 
 async function start() {
     checkWorkspaces()
+    initWorkspace()
 
     lastFilterArg = getConfig("lastFilterArg");
     _cmdMap = objDataFile(_cmdMapFile);
@@ -288,7 +288,7 @@ async function nextLine(callback, promptStr, hidden) {
 }
 
 function defaultPromptStr(showKey = false) {
-    let tips = [getTipStr(showKey), $defaultSpace].filter(i => i).join(':') + `> `;
+    let tips = [getTipStr(showKey), setting.defaultSpace].filter(i => i).join(':') + `> `;
     _isTipsDoneShowKey  = showKey;
     return tips;
 }
@@ -346,8 +346,8 @@ function initRl(callback, promptStr, hidden) {
 
 function getTipStr(showKey = false) {
     let items = [];
-    for (let key of Object.keys(global.$tips)) {
-        let val = global.$tips[key].map(i => {
+    for (let key of Object.keys(setting.tips)) {
+        let val = setting.tips[key].map(i => {
             let item = trim(i)
             if (item.indexOf(',') !== -1) {
                 item = `[${item}]`;
@@ -367,7 +367,7 @@ function getTipStr(showKey = false) {
         }
     }
     let tips = items.join(',')
-    if (!showKey && !_isTipsDoneShowKey && tips.length > 81) {
+    if (!showKey && !_isTipsDoneShowKey && tips.length > 64) {
         return '...'
     }
     return tips;
@@ -578,30 +578,18 @@ async function wrapperInput(str) {
 }
 
 function wrapperAlias(str) {
-    let aliasMap = null;
+    let aliasMap = {};
     try {
         aliasMap = getConfig("alias");
     } catch (e) {
-        console.$error(e);
+        console.$error("getAlias failed ", e);
     }
-    if (!aliasMap) {
+    if (Object.keys(aliasMap).length <= 0) {
         return str;
     }
-    let args = enrichArgs(str);
-    for (let i = 0; i < args.length; i++) {
-        let arg = args[i];
-        if (arg.endsWith("   ")) {
-            arg = `\`${arg}\``
-        } else if (arg.endsWith("  ")) {
-            arg = `"${arg}"`
-        } else if (arg.endsWith(" ")) {
-            arg = `'${arg}'`
-        } else {
-            arg = getAlias(aliasMap, arg)
-        }
-        args[i] = arg;
-    }
-    return args.join(' ')
+    let fstr = str.split(/\s+/)[0];
+    fstr = getAlias(aliasMap, fstr);
+    return [fstr, str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
 }
 
 async function _wrapperInput(str) {
@@ -884,14 +872,14 @@ function help(filterFn) {
 }
 
 function delTipsByIndex(idxs) {
-    let keys = Object.keys($tips)
+    let keys = Object.keys(setting.tips)
     let indexKeyMap = {}
     for(let i = 1;i<=keys.length;i++) {
         indexKeyMap[i] = keys[i - 1]
     }
     let params = []
     for (const index of idxs) {
-        if ($tips.hasOwnProperty(index)) {
+        if (setting.tips.hasOwnProperty(index)) {
             params.push(index)
         } else if (indexKeyMap[Number(index)]) {
             params.push(indexKeyMap[Number(index)])
@@ -907,7 +895,7 @@ function delTipsByIndex(idxs) {
 }
 
 function getPackageVersion(space, name) {
-    let moduleDir = $workspaceMap[space] + '/node_modules'
+    let moduleDir = setting.workspaceMap[space] + '/node_modules'
     let dir = moduleDir + "/" + name;
     if (fs.existsSync(dir) && fs.existsSync(dir + '/package.json')) {
         return require(dir + '/package.json').version;
@@ -920,12 +908,12 @@ function copyToSpace(uniqueName) {
     let path = getFullPath(uniqueName)
     let text = String(fs.readFileSync(path))
     let fileName = parseUniqueName(uniqueName)[1];
-    let targetPath = $workspaceMap[$defaultSpace] + '/' + fileName;
+    let targetPath = setting.workspaceMap[setting.defaultSpace] + '/' + fileName;
     if (fs.existsSync(targetPath)) {
-        console.warn(`${fileName} already exist in ${$defaultSpace}`)
+        console.warn(`${fileName} already exist in ${setting.defaultSpace}`)
     } else {
         fs.writeFileSync(targetPath, text)
-        console.info(`get ${uniqueName} to ${$defaultSpace}`)
+        console.info(`get ${uniqueName} to ${setting.defaultSpace}`)
     }
 }
 
@@ -1088,7 +1076,7 @@ const keywordDef = {
             } else {
                 let pair = parseUniqueName(uniqueName)
                 let newName =trim(args.slice(1).join(" "))
-                rename($workspaceMap[pair[0]], pair[1], toJsirFileName(newName), true)
+                rename(setting.workspaceMap[pair[0]], pair[1], toJsirFileName(newName), true)
             }
         },
         args: {
@@ -1177,8 +1165,8 @@ const keywordDef = {
                     return;
                 }
 
-                let aFiles = fs.readdirSync($workspaceMap[aSpace]).filter(isJsirFileName)
-                let bFiles = fs.readdirSync($workspaceMap[bSpace]).filter(isJsirFileName)
+                let aFiles = fs.readdirSync(setting.workspaceMap[aSpace]).filter(isJsirFileName)
+                let bFiles = fs.readdirSync(setting.workspaceMap[bSpace]).filter(isJsirFileName)
 
                 let result = compareMode[mode](aSpace, bSpace, aFiles, bFiles);
                 resetCmdMap(arrayToCmdMap(result))
@@ -1220,8 +1208,8 @@ const keywordDef = {
                 Object.keys(packages).forEach(key => {
                     let info = packages[key];
                     info.version = getPackageVersion(info.space, info.name)
-                    if (global.$packages.hasOwnProperty(info.name)) {
-                        info.loaded = global.$packages[info.name]
+                    if (setting.packages.hasOwnProperty(info.name)) {
+                        info.loaded = setting.packages[info.name]
                     }
                     if (info.loaded && info.loaded !== info.space) {
                         let version = getPackageVersion(info.loaded, info.name)
@@ -1264,14 +1252,14 @@ const keywordDef = {
             let newWorkspace = args.join(' ')
             let isSwitch = false
             if (newWorkspace) {
-                if ($workspaceMap[newWorkspace]) {
+                if (setting.workspaceMap[newWorkspace]) {
                     isSwitch = true;
                     initWorkspace(newWorkspace)
                 } else if (newWorkspace.startsWith('-')) {
                     let name = newWorkspace.replace(/^-\s*/, '');
                     arrayDataFile(_workspaceConfigFile, arr => arr.filter(path => name !== getSpaceFromDir(path)))
                 } else if (newWorkspace.startsWith("/")) {
-                    let workspaces = Object.values($workspaceMap)
+                    let workspaces = Object.values(setting.workspaceMap)
                     workspaces.push(newWorkspace)
                     arrayDataFile(_workspaceConfigFile, () => workspaces)
                 } else {
@@ -1279,10 +1267,11 @@ const keywordDef = {
                 }
             }
             checkWorkspaces()
-            let workspaces = Object.values($workspaceMap)
+            initWorkspace(setting.defaultSpace)
+            let workspaces = Object.values(setting.workspaceMap)
             let items = workspaces.map((path, index) => {
                 return {
-                    name: (getSpaceFromDir(path) === $defaultSpace ? '*':' ') + getSpaceFromDir(path),
+                    name: (getSpaceFromDir(path) === setting.defaultSpace ? '*':' ') + getSpaceFromDir(path),
                     path
                 }
             })
@@ -1382,7 +1371,7 @@ const keywordDef = {
             if (args.length > 1) {
                 _args = args.slice(1)
             }
-            await eia(`cd "${$workspaceMap[global.$defaultSpace]}";${cmd}`, _args, true)
+            await eia(`cd "${setting.workspaceMap[setting.defaultSpace]}";${cmd}`, _args, true)
         },
         short: 'E'
     },
@@ -1401,12 +1390,12 @@ const keywordDef = {
                 }
             }
             let suffix = 'log'
-            let cmdStr = 'less -R'
+            let cmdStr = 'less -R +G'
             if (type.indexOf("e") !== -1) {
                 suffix = 'error'
             }
             if (type.indexOf("t") !== -1) {
-                cmdStr = 'tail -n 50 -f'
+                cmdStr = 'less -R +F'
             }
             path = path + '.' + suffix;
             if (!fs.existsSync(path)) {
@@ -1462,7 +1451,7 @@ async function preLoad(text, fnNameMatch, fn, packages = [], space) {
             };
             await fn(packageName, space)
         } catch (e) {
-            console.$error(e)
+            console.$error('preLoad failed', e)
         }
     }
     return packages;
@@ -1501,14 +1490,17 @@ async function _dealKeyword(keyword, args) {
         if (item.short === shortKey) {
             unMatched = false;
             if (item === keywordDef.run) {
+                console.$log('execute', key)
                 await item.exeFn(args);
             } else {
+                console.$log('execute', key)
                 await item.exeFn(args.map(trim));
             }
             break;
         }
     }
     if (unMatched) {
+        console.$log('execute run', keyword)
         await keywordDef.run.exeFn([keyword, ...args])
     }
 }
@@ -1632,13 +1624,13 @@ function getJsirFileSuffix(name) {
 function initWorkspace(space) {
     let current = getConfig("workspace");
     let workspace = space || current || 'local'
-    if (!$workspaceMap[current]) {
+    if (!setting.workspaceMap[workspace]) {
         workspace = 'local'
     }
-    if (workspace !== current) {
+    if (workspace !== current && _noAppendNextLine) {
         setConfig("workspace", workspace)
     }
-    global.$defaultSpace = workspace;
+    setting.defaultSpace = workspace;
 }
 
 function filterCmdAndList(arg) {
@@ -1664,10 +1656,10 @@ function filterCmd(arg){
     let spaceName
     if (arg.indexOf('/') !== -1) {
         let index = arg.indexOf('/');
-        spaceName = trim(arg.substring(0, index)) || $defaultSpace
+        spaceName = trim(arg.substring(0, index)) || setting.defaultSpace
         arg = trim(arg.substring(index + 1))
     }
-    for (let workspace of Object.values($workspaceMap)) {
+    for (let workspace of Object.values(setting.workspaceMap)) {
         let spaceTmp = getSpaceFromDir(workspace);
         if (!spaceName || spaceName === spaceTmp) {
             cmds.push(..._filterCmd(workspace, arg));
@@ -2072,7 +2064,7 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         let pair = parseUniqueName($cmdName)
         currSpace = pair[0]
     } else {
-        currSpace = $defaultSpace
+        currSpace = setting.defaultSpace
     }
     let $requires = async (...matchItems) => {
         let result = []
@@ -2089,19 +2081,21 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         $require, $requires,
         nextLine, nextText,
         wrapperInput, filterCmd,
-        currSpace,
+        currSpace, setting.defaultSpace, setting.workspaceMap,
         $homeDir, $lib, _cmdMap);
 }
 
 function clearFileLock() {
-    let fileLockMap = getOr(global, `$fileLock`, {})
     for (let file of Object.keys(fileLockMap)) {
         fp.rmdir(file)
-        delete fileLockMap[file]
+        delete setting.fileLock[file]
     }
 }
 
 function sigExit() {
+    if (!setting.sigExit) {
+        return;
+    }
     if (_noAppendNextLine) {
         delTips();
         clearFileLock();

package/deps/evalCode.js

@@ -3,7 +3,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
                         $require, $requires,
                         $nextLine, $nextText,
                         $enter, $filterCmd,
-                        $currentSpace,
+                        $currentSpace, $defaultSpace, $workspaceMap,
                         $homeDir, $lib,
                         $cmdMap) => {
     const $defArgs = () => $args;
@@ -26,13 +26,15 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     const $errorTag = $lib.errorTag;
 
     const $context = {
+        $defArgs,
         $data, $config, $file,
         $require, $requires, $import,
         $text, $cmdName, $args,
         $nextLine, $nextText,
         $setTips, $delTips,
         $enter, $filterCmd,
-        $currentSpace, $homeDir, $lib, $cmdMap,
+        $currentSpace, $defaultSpace, $workspaceMap,
+        $homeDir, $lib, $cmdMap
     }
     let console = $lib.createConsole($cmdName);
     return await eval(`(async ()=>{${$text};

package/deps/setting.js

@@ -17,5 +17,11 @@ module.exports = {
     exeKey,
     initKey,
     fileKey,
-    defaultType
+    defaultType,
+    sigExit: true,
+    packages: {},
+    fileLock: {},
+    tips: {},
+    defaultSpace: 'local',
+    workspaceMap: {}
 }

package/deps/util.js

@@ -16,11 +16,7 @@ const _types = setting.fileType
 const _typeKeys = Object.keys(_types)
 
 global.$newInput = false
-global.$workspaceMap = {}
-global.$defaultSpace = 'local'
 global.$newError = false
-global.$tips = {}
-global.$packages = {}
 
 let libDataDir;
 let lockDir;
@@ -71,7 +67,8 @@ const $log = createLimitLogger(`${setting.name}.log`, {
 });
 const $error = createLimitLogger(`${setting.name}.error`, {
     logInfo: false,
-    error: true
+    error: true,
+    syncLogs: [$log]
 });
 let _globalDraft= createLimitLogger(`draft.log`, {
     logInfo: false,
@@ -209,7 +206,8 @@ function createConsole(uniqueName) {
         });
         result.$error = createLimitLogger(fileName + '.error', {
             logInfo: false,
-            error: true
+            error: true,
+            syncLogs: [result.$log]
         });
     }
     let quite = false
@@ -230,7 +228,6 @@ function createConsole(uniqueName) {
                 }
                 let _args = _consoleFns[key].args(args);
                 if ("error" === key) {
-                    result.$log(..._args)
                     result.$error(..._args)
                 } else {
                     result.$log(..._args)
@@ -255,7 +252,7 @@ function getFullPath(name) {
     }
     let uniqueName = toUniqueName(name)
     let pair = parseUniqueName(uniqueName)
-    let space = $workspaceMap[pair[0]]
+    let space = setting.workspaceMap[pair[0]]
     if (!space) {
         return ''
     }
@@ -281,10 +278,10 @@ function toUniqueName(name, space) {
     } else if (name.indexOf('/') !== -1) {
         uniqueName = name;
     } else {
-        uniqueName = (space || $defaultSpace) + '/' + name;
+        uniqueName = (space || setting.defaultSpace) + '/' + name;
     }
     let pair = parseUniqueName(uniqueName);
-    return (pair[0] || space || $defaultSpace) + '/' + toJsirFileName(pair[1])
+    return (pair[0] || space || setting.defaultSpace) + '/' + toJsirFileName(pair[1])
 }
 
 function toJsirFileName(name) {
@@ -502,7 +499,7 @@ function getEditor() {
     try {
         defaultEditor = getConfig("defaultEditor", "vi");
     } catch (e) {
-        console.$error('getConfig failed', e);
+        console.$error('getEditor failed', e);
     }
     return defaultEditor
 }
@@ -640,7 +637,8 @@ function createLimitLogger(fileName, {
     maxChars = 49 * 1024 * 1024,
     logInfo = true,
     time = true,
-    error = false
+    error = false,
+    syncLogs = []
 } = {}) {
     fileName = trim(fileName)
     if (!fileName) {
@@ -657,10 +655,16 @@ function createLimitLogger(fileName, {
     }
     let minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
     return (...args) => {
-        let text = args.join(" ")
-        if (!text) {
+        if (args.length <= 0) {
             return
         }
+        // 处理参数
+        args = args.map(i => isError(i) ? errorStack(i):i);
+
+        // 处理同步函数
+        syncLogs.forEach(i => i(...args));
+
+        let text = args.join(" ")
         if (error) {
             global.$newError = true;
         }
@@ -692,7 +696,7 @@ function iarrayDataFile(fileName, fn, fmt) {
 }
 function getInitName(fileName) {
     fileName = trim(fileName)
-    let homeDir = global.$workspaceMap[$defaultSpace]
+    let homeDir = setting.workspaceMap[setting.defaultSpace]
     if (!fileName.startsWith("/")) {
         fileName = setting.initKey + ' ' + fileName.replace(new RegExp(`^${setting.initKey}\\s+`), '')
         if (!/\..+/.test(fileName)) {
@@ -761,7 +765,7 @@ async function fileJson(key, fn, fmt = true) {
     let dataDir = getLibDataDir() + "/data"
     let fileName = trim(key)
     let path = dataDir + "/" + fileName;
-    let homeDir = global.$workspaceMap[$defaultSpace]
+    let homeDir = setting.workspaceMap[setting.defaultSpace]
     let isInit = fileName.startsWith(setting.initKey);
     if (isInit) {
         path = homeDir + '/' + toJsirFileName(fileName);
@@ -790,7 +794,7 @@ async function fileJson(key, fn, fmt = true) {
 }
 
 function setModulePaths(space) {
-    let moduleDir = $workspaceMap[space] + '/node_modules'
+    let moduleDir = setting.workspaceMap[space] + '/node_modules'
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
         module.paths.push(moduleDir)
@@ -800,13 +804,13 @@ function setModulePaths(space) {
 }
 
 function enrichPackages(moduleName, space) {
-    if (!global.$packages.hasOwnProperty(moduleName)) {
-        global.$packages[moduleName] = space
+    if (!setting.packages.hasOwnProperty(moduleName)) {
+        setting.packages[moduleName] = space
     }
 }
 
 function requireG(moduleName, space){
-    space = space || global.$defaultSpace;
+    space = space || setting.defaultSpace;
     let moduleDir = setModulePaths(space);
     if (module.paths.indexOf(moduleDir) === -1) {
         module.paths.splice(0, module.paths.length)
@@ -828,7 +832,7 @@ function requireG(moduleName, space){
 }
 
 async function importG(moduleName, space) {
-    space = space || global.$defaultSpace;
+    space = space || setting.defaultSpace;
     let moduleDir = setModulePaths(space);
     try {
         let result = await import(moduleName);
@@ -862,7 +866,7 @@ function aesCipher(str, key){
         const cipher = crypto.createCipheriv('aes-128-ecb', pad(key, 16, '0'), null);
         return cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
     } catch(err) {
-        $log(errorStack(err))
+        $error(err)
         throw 'aesCipher failed: ' + String(err)
     }
 }
@@ -879,7 +883,7 @@ function aesDecipher(str, key){
         const decipher = crypto.createDecipheriv('aes-128-ecb', pad(key, 16, '0'), null);
         return decipher.update(str, 'hex', 'utf8') + decipher.final('utf8');
     } catch(err) {
-        $log(errorStack(err))
+        $error(err)
         throw 'aesDecipher failed: ' + String(err)
     }
 }
@@ -1056,7 +1060,7 @@ async function _fileLock(key, fn) {
     } catch (e) {
         return false;
     }
-    let fileLockMap = getOr(global, `$fileLock`, {})
+    let fileLockMap = setting.fileLock;
     fileLockMap[file] = true;
     try {
         await fn();
@@ -1108,19 +1112,19 @@ function setTips(key, value, onRm) {
     if (!vl(key) || key.indexOf(",") !== -1) {
         throw "invalid tip key";
     }
-    getOr(global.$tips, key, []).push(value);
+    getOr(setting.tips, key, []).push(value);
     if (onRm) {
         getOr(_tipsOnRm, key, []).push(onRm)
     }
 }
 
 function delTips(...keys) {
-    for (let key of Object.keys($tips)) {
+    for (let key of Object.keys(setting.tips)) {
         if (keys.length === 0) {
-            delete $tips[key]
+            delete setting.tips[key]
             tipsOnRmCallback(key)
         } else if (keys.indexOf(key) !== -1) {
-            delete $tips[key]
+            delete setting.tips[key]
             tipsOnRmCallback(key)
         }
     }
@@ -1139,8 +1143,7 @@ function tipsOnRmCallback(key) {
             try {
                 callback()
             } catch (e) {
-                $log(errorStack(e))
-                console.error(`[${key}] OnRmCallback: ${String(e)}`)
+                $error(`[${key}] OnRmCallback`, e)
             }
         }
     }
@@ -1179,7 +1182,7 @@ function fileCleaner(path, maxChars) {
     `
     cleanFiles[path] = Date.now() + (1000 * 60)
     let flag = "sys"
-    if (!$tips[flag]) {
+    if (!setting.tips.hasOwnProperty(flag)) {
         timer(flag, 1000 * 9, () => {
             for (let aPath of Object.keys(cleanFiles)) {
                 if (cleanFiles[aPath] < Date.now()) {
@@ -1211,7 +1214,7 @@ function cleanFile(path, maxChars = 9 * 1024 * 1024) {
         try {
             stats = await fp.stat(path);
         } catch (e) {
-            console.$error('cleanFile stat failed', errorMsg(e));
+            console.$error('cleanFile stat failed', e);
             return;
         }
         const fileSize = stats.size;
@@ -1292,8 +1295,7 @@ function timeLoop(fn, timestamp, lastIds = []){
     try {
         val = fn()
     } catch (e) {
-        console.error(String(e))
-        $log(new Error(errorStack(e)).stack)
+        $error(e)
     }
     if (vl(val) && getType(val) === 'Promise') {
         return val.then(result => {
@@ -1302,8 +1304,7 @@ function timeLoop(fn, timestamp, lastIds = []){
             }
             return lastIds
         }).catch(e => {
-            console.error(String(e))
-            $log(new Error(errorStack(e)).stack)
+            $error(e)
 
             if (lastIds[0] !== false) {
                 lastIds[0] = setTimeout(() => timeLoop(fn, timestamp, lastIds), timestamp)
@@ -1348,7 +1349,7 @@ function mkdir(dir) {
     try {
         fs.mkdirSync(dir)
     } catch (e) {
-        console.$error(errorStack(e))
+        console.$error(e)
     }
 }
 
@@ -1394,14 +1395,17 @@ async function eia(cmd, args = [], shell = false) {
     `
     当前进程不会卡住，输入输出由cmd进程持有
     `
+    setting.sigExit = false;
     let child = spawn(cmd, args, {stdio:"inherit", shell});
     return new Promise((resolve, reject) => {
         // 监听子进程的关闭事件
         child.on('close', (code) => {
+            setting.sigExit = true;
             resolve(code);
         });
         // 可选：监听子进程的错误事件
         child.on('error', (err) => {
+            setting.sigExit = true;
             reject(err)
         });
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {