jsir 3.0.2 → 3.0.4

package/cmd/oaa.js

@@ -404,6 +404,10 @@ function closeRl() {
 }
 
 function _nextLine(callback, promptStr, hidden, resolve, reject, end, isText) {
+    if (isRunningInBackground()) {
+        reject("Unsupported Operation")
+        return;
+    }
     callback = callback || wrapperInput;
     if (!setting.enableNextLine) {
         console.$warn("NextLine Disabled");
@@ -469,6 +473,7 @@ function _nextLine(callback, promptStr, hidden, resolve, reject, end, isText) {
     if (callback === wrapperInput) {
         setting.promptId = Date.now();
         setting.lastOutput = null;
+        terminalTitle();
     }
 }
 
@@ -1185,20 +1190,33 @@ const keywordDef = {
     clear: {
         comment: 'Clear task',
         exeFn: async (args) => {
-            if (args.length > 0 && _cmdMap[args[0]]) {
-                let cmdName = _cmdMap[args[0]];
-                if (args.length === 1) {
-                    $data.del(cmdName)
-                } else {
-                    let metadata = $data.get(cmdName);
-                    if (!vl(metadata) || typeof metadata !== 'object') {
-                        return;
+            if (args.length > 0) {
+                if (_cmdMap[args[0]]) {
+                    let cmdName = _cmdMap[args[0]];
+                    if (args.length === 1) {
+                        $data.del(cmdName)
+                        console.msg('remove metadata of', cmdName)
+                    } else {
+                        let metadata = $data.get(cmdName);
+                        if (!vl(metadata) || typeof metadata !== 'object') {
+                            return;
+                        }
+                        for (let key of args.slice(1)) {
+                            if (metadata.hasOwnProperty(key)) {
+                                delete metadata[key]
+                                console.msg('remove metadata of', cmdName,  key)
+                            }
+                        }
                     }
-                    for (let key of args.slice(1)) {
-                        if (metadata.hasOwnProperty(key)) {
-                            delete metadata[key]
+                } else if ('0' === args[0]) {
+                    for (let key of $data.key()) {
+                        if (setting.workspaceMap[key.split("/")[0]]) {
+                            $data.del(key)
+                            console.msg('remove metadata of', key)
                         }
                     }
+                } else {
+                    await delTips(...args)
                 }
             } else {
                 await delTips(...args)
@@ -1708,15 +1726,24 @@ const keywordDef = {
             if (args.length > 0) {
                 let have = false;
                 let tasks = []
+                let targets = []
+                let inputArgs = []
+                for (let arg of args) {
+                    if (inputArgs.length > 0 || !/^\d/.test(arg)) {
+                        inputArgs.push(arg)
+                    } else {
+                        targets.push(arg)
+                    }
+                }
                 for (let room of setting.rooms) {
                     for (let pid of Object.keys(room.jsirs || {})) {
-                        if (args.indexOf(room.selfNode) === -1 && args.indexOf(pid) === -1) {
+                        if (targets.indexOf(room.selfNode) === -1 && targets.indexOf(pid) === -1) {
                             continue;
                         }
                         if (setting.selfRoom.selfNode === room.selfNode && String(process.pid) === pid) {
                             continue;
                         }
-                        if (setting.selfRoom.selfNode !== room.selfNode && args.includes(room.selfNode) && !args.includes(pid)
+                        if (setting.selfRoom.selfNode !== room.selfNode && targets.includes(room.selfNode) && !targets.includes(pid)
                             && room.jsirs[pid].port === setting.defaultPort) {
                             continue;
                         }
@@ -1729,7 +1756,8 @@ const keywordDef = {
                         })
                     }
                 }
-                let input = have ? await nextLine(i => i):''
+                let inputStr = trim(inputArgs.join(" "))
+                let input = have ? (inputStr || await nextLine(i => i)):''
                 if (vl(input)) {
                     for (let task of tasks) {
                         try {
@@ -1824,11 +1852,11 @@ async function _dealKeyword(keyword, args) {
         let shortKey = keyword === key ? item.short : keyword;
         if (item.short === shortKey) {
             unMatched = false;
+            console.$log('Execute', key)
+            terminalTitle(key)
             if (item === keywordDef.run) {
-                console.$log('Execute', key)
                 await item.exeFn(args);
             } else {
-                console.$log('Execute', key)
                 await item.exeFn(args.map(trim));
             }
             break;
@@ -2133,6 +2161,31 @@ async function runScript(uniqueName, oriArgs) {
     return await evalText(text, uniqueName, scriptArgs)
 }
 
+function verifyArgs(scriptArgs = {}, argDef, _uniqueName) {
+    let argNames = Object.keys(argDef)
+    let argAbsent = false
+    let scriptArgKeys = Object.keys(scriptArgs);
+    for (let name of argNames) {
+        let defStr = argDef[name]
+        let beginIdx = defStr.indexOf("^");
+        let endIdx = defStr.indexOf("$");
+        let reg
+        if (beginIdx !== -1 && endIdx !== -1 && beginIdx < endIdx) {
+            reg = new RegExp(defStr.substring(beginIdx, endIdx + 1));
+        }
+        if (name.startsWith("_") && scriptArgKeys.indexOf(name) === -1) {
+            continue
+        }
+        if (scriptArgKeys.indexOf(name) === -1 || (reg && !reg.test(scriptArgs[name]))) {
+            argAbsent = true
+            console.warn(`require ${warnStr(name)}` + (defStr ? ` ${defStr}` : ''))
+        }
+    }
+    if (argAbsent) {
+        throw _uniqueName ? `invalid args for ${_uniqueName}`:'invalid args';
+    }
+}
+
 async function getScriptArgs(argDef, oriArgs) {
     let shortDefMap = getShortDefMap(Object.keys(argDef))
     oriArgs = oriArgs.map(i => shortDefMap[i] ? shortDefMap[i]:i)
@@ -2184,27 +2237,7 @@ async function getScriptArgs(argDef, oriArgs) {
     for (let key of Object.keys(exactArgs)) {
         scriptArgs[key] = exactArgs[key]
     }
-    let argAbsent = false
-    let scriptArgKeys = Object.keys(scriptArgs);
-    for(let name of argNames) {
-        let defStr = argDef[name]
-        let beginIdx = defStr.indexOf("^");
-        let endIdx = defStr.indexOf("$");
-        let reg
-        if (beginIdx !== -1 && endIdx !== -1 && beginIdx < endIdx) {
-            reg = new RegExp(defStr.substring(beginIdx, endIdx + 1));
-        }
-        if (name.startsWith("_") && scriptArgKeys.indexOf(name) === -1) {
-            continue
-        }
-        if (scriptArgKeys.indexOf(name) === -1 || (reg && !reg.test(scriptArgs[name]))) {
-            argAbsent = true
-            console.warn(`require ${warnStr(name)}` + (defStr ? ` ${defStr}`:''))
-        }
-    }
-    if (argAbsent) {
-        throw 'invalid args';
-    }
+    verifyArgs(scriptArgs, argDef);
     return scriptArgs;
 }
 
@@ -2286,7 +2319,7 @@ function parseArgDef(inputString) {
 }
 
 function getArgDef(text, uniqueName) {
-    if (uniqueName && getJsirTypeKey(parseUniqueName(uniqueName)[1]) !== setting.exeKey) {
+    if (uniqueName && ![setting.exeKey, setting.initKey].includes(getJsirTypeKey(parseUniqueName(uniqueName)[1]))) {
         return {}
     }
     if (text.indexOf("$defArgs") === -1) {
@@ -2350,7 +2383,7 @@ function filterRequire(currSpace, cmdMatchStr) {
     return cmds[0];
 }
 
-async function _requireSource(currSpace, cmdMatchStr, force = false) {
+async function _requireSource(currSpace, cmdMatchStr, force = false, $args) {
     let result
     let uniqueName = filterRequire(currSpace, cmdMatchStr);
     let path = getFullPath(uniqueName)
@@ -2364,19 +2397,29 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
         } else {
             if (setting.serviceReg.test(uniqueName)) {
                 let serviceKey = `${pair[0]}/${trimJsirFileName(pair[1])}`
-                if (setting.services[serviceKey]) {
-                    let serviceObj = {};
-                    for (let fn of setting.services[serviceKey]) {
-                        serviceObj[fn] = async (...args) => {
-                            return await Room.reqFn(`${serviceKey}/${fn}`, args);
+                return new Proxy({}, {
+                    get(target, prop) {
+                        if (prop === 'then') {
+                            return undefined;
+                        }
+                        let fns = setting.services[serviceKey]
+                        if (!fns) {
+                            throw `invoke ${prop} failed cause service ${serviceKey} not found`;
+                        }
+                        if (!fns.includes(prop)) {
+                            throw `service function ${serviceKey}/${prop} not found`;
+                        }
+                        return async (...args) => {
+                            return await Room.reqFn(`${serviceKey}/${prop}`, args);
                         }
                     }
-                    return serviceObj
-                } else {
-                    throw `service ${serviceKey} not found`;
-                }
+                })
             } else {
-                result = await evalText(text, uniqueName)
+                let argDef = getArgDef(text)
+                if (Object.keys(argDef).length > 0) {
+                    verifyArgs($args, argDef, uniqueName);
+                }
+                result = await evalText(text, uniqueName, $args)
             }
         }
     } else if (typeKey === setting.exeKey) {
@@ -2384,7 +2427,11 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
             return await runCmd(trim(argsStr), uniqueName, text)
         }
     } else {
-        result = text;
+        if (path.endsWith(".json")) {
+            result = JSON.parse(text);
+        } else {
+            result = text;
+        }
     }
     if (!vl(result)) {
         throw `invalid result: ${cmdMatchStr}`
@@ -2504,8 +2551,8 @@ async function evalText($text = '', $cmdName = '', $args = {}) {
         }
         return result
     }
-    let $require = async (matchItem) => {
-        return await _requireSource(currSpace, matchItem)
+    let $require = async (matchItem, $args) => {
+        return await _requireSource(currSpace, matchItem, false, $args)
     }
     return await evalCode(addErrorTag($text), $cmdName, $args,
         $data,

package/deps/evalCode.js

@@ -16,11 +16,18 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
 
     // 兼容
     $text = $lib.wrapperJsirText($text)
+    $text = $text.split("\n").map(i => {
+        const argPass = /\)\s*\|\|/
+        if (/\$require\s*\(/.test(i) && argPass.test(i)) {
+            return i.replace(argPass, ',').trimEnd() + ")"
+        }
+        return i
+    }).join("\n")
 
     const $tips = $lib.tipFns;
-    const $errorTag = $lib.errorTag;
 
     // 不在context中
+    const $errorTag = $lib.errorTag;
     const $setTips = $lib.setTips;
     const $delTips = $lib.delTips;
     const $aop = $lib.aop;

package/deps/room.js

@@ -582,7 +582,10 @@ function busyPick(busyItems) {
 }
 
 async function reqFn(fnKey, args = []) {
-    let targets = setting.serviceFns[fnKey] || []
+    let targets = setting.serviceFns[fnKey]
+    if (!targets) {
+        throw `service function ${fnKey} instance not found`;
+    }
     targets = targets
         .filter(i => i.active)
         .filter(i => !isDisableConnect(i.node, i.port));
@@ -590,7 +593,7 @@ async function reqFn(fnKey, args = []) {
     if (targets.length > 0) {
         target = busyPick(targets);
     } else {
-        throw `service function ${fnKey} not found`;
+        throw `service function ${fnKey} instance not enable`;
     }
     let resp = await reqNode(target.node, 'post',
         `/${fnKey}`, target.port, JSON.stringify(args || []))

package/deps/util.js

@@ -6,7 +6,7 @@ const fs = require('fs')
 const fp = require('fs').promises
 const BigNumber = require('bignumber.js');
 const crypto = require('crypto');
-const dayJs = require('dayjs')
+const dayjs = require('dayjs')
 const table = require('console.table')
 const initModulePaths = Object.assign([], module.paths)
 const path = require('path')
@@ -678,7 +678,7 @@ function getFileOpenExe() {
 }
 
 function timeStr(fmt, date) {
-    return dayJs(date || new Date()).format(fmt || 'YYYY-MM-DD HH:mm:ss')
+    return dayjs(date || new Date()).format(fmt || 'YYYY-MM-DD HH:mm:ss')
 }
 
 function vl(obj) {
@@ -2065,8 +2065,9 @@ function getTextComments(text) {
 function wrapperJsirText(text) {
     return text
         .replace(/^require\s*\(\s*(["'`][ei][^a-zA-Z]+)/mg, 'await $require($1')
-        .replace(/([\s=;]require\s*\(\s*["'`])\.\/([ei][^a-zA-Z]+)/g, '$1$2')
+        // .replace(/([\s=;]require\s*\(\s*["'`])\.\/([ei][^a-zA-Z]+)/g, '$1$2')
         .replace(/([\s=;])require\s*\(\s*(["'`][ei][^a-zA-Z]+)/g, '$1await $require($2')
+        .replace(/([\s=;])require\s*\(\s*(["'`])\.\//g, '$1await $require($2')
         .replace(/([\s=;])import\s*\(/g, '$1$import(')
         .replace(/^import\s*\(/mg, '$import(')
         .replace(/^module\.exports\s*=\s*/m, 'return ')
@@ -2280,7 +2281,7 @@ module.exports = {
     removeFirst,
     sleep,
     timeLimit,
-    dayJs,
+    dayjs,
     setCbText,
     randomInt,
     vl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {
@@ -18,9 +18,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "bignumber.js": "^9.0.0",
-    "chokidar": "^3.5.2",
-    "console.table": "^0.10.0",
-    "dayjs": "^1.10.4"
+    "bignumber.js": "9.0.0",
+    "chokidar": "3.5.2",
+    "console.table": "0.10.0",
+    "dayjs": "1.10.4"
   }
 }