jsir 3.0.6 → 3.0.8

package/cmd/oaa.js

@@ -192,7 +192,10 @@ function checkWorkspaces() {
             continue
         }
         if (fs.existsSync(workspace)) {
-            setting.workspaceMap[space] = workspace;
+            let stat = fs.lstatSync(workspace)
+            if (stat.isDirectory()) {
+                setting.workspaceMap[space] = workspace;
+            }
         }
     }
     arrayDataFile(_workspaceConfigFile, () => Object.values(setting.workspaceMap))
@@ -667,13 +670,21 @@ async function wrapperInput(str, packOutput = false) {
     }
 }
 
-function wrapperAlias(str) {
+function wrapperAlias(items) {
     let aliasMap = getConfig("alias");
     if (!aliasMap || Object.keys(aliasMap).length <= 0) {
-        return str;
+        return items;
+    }
+    let result = []
+    for (let i = 0; i < items.length; i++) {
+        let item = items[i]
+        if (!item.endsWith(" ") && item.startsWith(".")) {
+            result.push(...enrichArgs(getAlias(aliasMap, item)))
+        } else {
+            result.push(item)
+        }
     }
-    let fstr = str.split(/\s+/)[0];
-    return [getAlias(aliasMap, fstr), str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
+    return result;
 }
 
 async function _wrapperInput(str) {
@@ -683,7 +694,6 @@ async function _wrapperInput(str) {
         return;
     }
     setting.newError = false;
-    str = wrapperAlias(str);
 
     if (/^[`'"]/.test(str)) {
         let fstr = str.substring(0, 1);
@@ -714,7 +724,7 @@ async function _wrapperInput(str) {
             await evalText(text)
         }
     } else if (str.match(/^\./)) {
-        await dealKeyword(enrichArgs(str))
+        await dealKeyword(wrapperAlias(enrichArgs(str)))
     } else if (!str.split(/\s+/)[0].match(/^\d+$/)) {
         filterCmdAndList(str);
     } else {
@@ -1535,6 +1545,13 @@ const keywordDef = {
                     let workspaces = Object.values(setting.workspaceMap)
                     workspaces.push(newWorkspace)
                     arrayDataFile(_workspaceConfigFile, () => workspaces)
+                } else if (newWorkspace.startsWith("+")) {
+                    let name = newWorkspace.replace(/^\+\s*/, '');
+                    let path = setting.workspaceMap[name]
+                    if (path && name !== setting.defaultSpace) {
+                        let target = setting.workspaceMap[setting.defaultSpace] + '/' + name
+                        recreateSymlink(path, target)
+                    }
                 } else {
                     console.warn('invalid args')
                 }
@@ -1610,7 +1627,7 @@ const keywordDef = {
                     }
                 }
             } else {
-                console.warn(`require "${keyword}" not unique`)
+                console.warn(`require "${keyword}" not exist&unique`)
             }
         },
         args: {
@@ -1755,10 +1772,6 @@ const keywordDef = {
                         if (setting.selfRoom.selfNode === room.selfNode && String(process.pid) === pid) {
                             continue;
                         }
-                        if (setting.selfRoom.selfNode !== room.selfNode && targets.includes(room.selfNode) && !targets.includes(pid)
-                            && room.jsirs[pid].port === setting.defaultPort) {
-                            continue;
-                        }
                         tasks.push(async (input) => {
                             let pidKey = `[${room.name} ${pid}]`
                             if (taskPids.includes(pid)) {
@@ -2027,6 +2040,15 @@ function initWorkspace(space) {
     setting.defaultSpace = workspace;
 }
 
+function recreateSymlink(src, dest) {
+    // 如果存在则删除(无论是文件还是软链)
+    if (fs.existsSync(dest)) {
+        fs.unlinkSync(dest);
+    }
+    // 重新创建软链
+    fs.symlinkSync(src, dest, 'dir'); // dir/file 根据实际类型
+}
+
 function filterCmdAndList(arg) {
     arg = trim(arg) || lastFilterArg;
     if (arg) {
@@ -2399,7 +2421,7 @@ function filterRequire(currSpace, cmdMatchStr) {
         }
     }
     if (cmds.length !== 1) {
-        throw `require "${cmdMatchStr}" not unique`
+        throw `require "${cmdMatchStr}" not exist&unique`
     }
     return cmds[0];
 }
@@ -2431,7 +2453,7 @@ async function _requireSource(currSpace, cmdMatchStr, force = false, $args) {
                             throw `service function ${serviceKey}/${prop} not found`;
                         }
                         return async (...args) => {
-                            return await Room.reqFn(`${serviceKey}/${prop}`, args);
+                            return await Room.reqFn(`${serviceKey}/${prop}`, args, $args);
                         }
                     }
                 })

package/deps/room.js

@@ -44,11 +44,11 @@ function onRoom() {
                     res.output = warnStr("Disable Remote")
                     return;
                 }
+                if (!isRunningInBackground()) {
+                    res.output = warnStr("Disable Remote")
+                    return;
+                }
                 if (vl(req.input)) {
-                    if (!isRunningInBackground() && ['.nsir', '.N'].indexOf(req.input.trim()) === -1) {
-                        res.output = warnStr("Disable Remote")
-                        return;
-                    }
                     res.output = await setting.wrapperInput(req.input, true)
                     setting.promptId = Date.now()
                 }
@@ -113,12 +113,11 @@ async function initNodes() {
             console.$debug("initNodes", e)
         }
         for (let line of resp.split("\n").map(trim)) {
-            let offline = line.indexOf('offline') !== -1
             let ss = line.split(/\s+/);
             if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
                 nodes[ss[0]] = {
                     name: ss[1],
-                    offline,
+                    offline: line.indexOf('offline') !== -1 ,
                     account: ss[2]
                 }
             }
@@ -253,9 +252,11 @@ async function _syncSetting(room) {
         }
         for (const pid of Object.keys(room.jsirs || {})) {
             let jsir = room.jsirs[pid];
-            for (const service of Object.keys(jsir.services || {})) {
+            for (let service of Object.keys(jsir.services || {})) {
                 let serviceFns = jsir.services[service] || [];
-
+                if (service.endsWith("+")) {
+                    service = service.substring(0, service.length - 1)
+                }
                 let existFns = setting.services[service] || [];
                 existFns.push(...serviceFns)
                 setting.services[service] = [...new Set(existFns)]
@@ -421,7 +422,12 @@ async function initRoomJsir(room) {
         let ss = key.split("/").map(trim).filter(i => i);
         if (ss.length > 3) {
             // 脚本空间service
-            getOr(services, ss[1] + '/' + ss[2], []).push(ss[3])
+            let route = setting.routes[key]
+            let serviceKey = ss[1] + '/' + ss[2]
+            if (route.isApi) {
+                serviceKey = serviceKey + '+'
+            }
+            getOr(services, serviceKey, []).push(ss[3])
         } else if (ss.length > 2) {
             // jsir service
             getOr(services, ss[1], []).push(ss[2])
@@ -581,14 +587,24 @@ function busyPick(busyItems) {
     }
 }
 
-async function reqFn(fnKey, args = []) {
+function isMatchTarget(target, node, port) {
+    if (!target) {
+        return true;
+    }
+    target = String(target).trim()
+    if (target.includes(":")) {
+        return target === `${node}:${port}`
+    } else {
+        return target === node;
+    }
+}
+
+async function reqFn(fnKey, args = [], reqTarget) {
     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));
+    targets = targets.filter(i => isMatchTarget(reqTarget, i.node, i.port) && i.active && !isDisableConnect(i.node, i.port));
     let target = null;
     if (targets.length > 0) {
         target = busyPick(targets);

package/deps/util.js

@@ -333,6 +333,10 @@ function createConsole(uniqueName, _logToFile, _errorToFile) {
                 }
                 setting.lastChangeFlag = flag
             }
+            if (!is$ && uniqueName && quite && hasFlag) {
+                // ignore
+                return;
+            }
             if (is$ || (uniqueName && quite) || (setting.lastOutput && !hasFlag && 'debug' === key)) {
                 if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
                     args = ['', ...args]
@@ -2066,11 +2070,17 @@ 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, '$1await $require($2')
+
+        .replace(/^require\s*\(\s*(["'`][^/.]+\/[ei][^a-zA-Z]+)/mg, 'await $require($1')
+        .replace(/([\s=;])require\s*\(\s*(["'`][^/.]+\/[ei][^a-zA-Z]+)/g, '$1await $require($2')
+
+        .replace(/^require\s*\(\s*(["'`])\.\//mg, 'await $require($1')
         .replace(/([\s=;])require\s*\(\s*(["'`])\.\//g, '$1await $require($2')
-        .replace(/([\s=;])import\s*\(/g, '$1$import(')
+
         .replace(/^import\s*\(/mg, '$import(')
+        .replace(/([\s=;])import\s*\(/g, '$1$import(')
+
         .replace(/^module\.exports\s*=\s*/m, 'return ')
         ;
 }
@@ -2375,5 +2385,6 @@ module.exports = {
     currentJsir,
     currentRoom,
     currentRooms,
-    uid
+    uid,
+    consoleStrs
 }

package/package.json

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