jsir 3.0.5 → 3.0.7

package/cmd/oaa.js

@@ -56,12 +56,21 @@ const _dealOnLazyGet = (key, onLazyTempCode) => {
         return _data[key]
     }
     return new Promise(async (resolve, reject) => {
-        let inputCode = onLazyTempCode || await nextLine(i => i, "TEMP_CODE: ", true)
-        if (inputCode !== _onLazyTempCode) {
-            reject("tempCode check failed")
+        if (typeof _onLazyTempCode === 'function') {
+            if (!await _onLazyTempCode()) {
+                reject("tempCode check failed")
+            } else {
+                _onLazyGetMap[key] = Date.now() + _lazyTime
+                resolve(_data[key])
+            }
         } else {
-            _onLazyGetMap[key] = Date.now() + _lazyTime
-            resolve(_data[key])
+            let inputCode = onLazyTempCode || await nextLine(i => i, "TEMP_CODE: ", true)
+            if (inputCode !== _onLazyTempCode) {
+                reject("tempCode check failed")
+            } else {
+                _onLazyGetMap[key] = Date.now() + _lazyTime
+                resolve(_data[key])
+            }
         }
     })
 }
@@ -75,6 +84,11 @@ const _dataSet = (key, val, onLazyTempCode) => {
         }
     } else if (true === onLazyTempCode) {
         useOnLazy = true
+    } else if (typeof onLazyTempCode === "function") {
+        useOnLazy = true
+        if (!vl(_onLazyTempCode)) {
+            _onLazyTempCode = onLazyTempCode;
+        }
     } else if (onLazyTempCode !== undefined) {
         throw "invalid tempCode defined"
     }
@@ -178,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))
@@ -635,7 +652,13 @@ async function wrapperInput(str, packOutput = false) {
         await _wrapperInput(str);
     } catch (e) {
         if (promptId === setting.promptId) {
-            console.error(e)
+            let msg = (e.message || e);
+            if (msg === 'Terminal Interrupt') {
+                console.warn(msg)
+                console.$warn(e)
+            } else {
+                console.error(e)
+            }
         } else {
             console.$error(e)
         }
@@ -647,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 fstr = str.split(/\s+/)[0];
-    return [getAlias(aliasMap, fstr), str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
+    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)
+        }
+    }
+    return result;
 }
 
 async function _wrapperInput(str) {
@@ -663,7 +694,6 @@ async function _wrapperInput(str) {
         return;
     }
     setting.newError = false;
-    str = wrapperAlias(str);
 
     if (/^[`'"]/.test(str)) {
         let fstr = str.substring(0, 1);
@@ -694,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 {
@@ -1515,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')
                 }
@@ -1590,7 +1627,7 @@ const keywordDef = {
                     }
                 }
             } else {
-                console.warn(`require "${keyword}" not unique`)
+                console.warn(`require "${keyword}" not exist&unique`)
             }
         },
         args: {
@@ -1720,21 +1757,13 @@ const keywordDef = {
         short: 'T'
     },
     room: {
-        comment: 'manage room ([node])',
+        comment: 'manage room ([node/pid][cmdStr])',
         exeFn: async (args) => {
             await Room.syncSetting();
             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)
-                    }
-                }
+                let taskPids = []
+                let targets = [args[0]]
                 for (let room of setting.rooms) {
                     for (let pid of Object.keys(room.jsirs || {})) {
                         if (targets.indexOf(room.selfNode) === -1 && targets.indexOf(pid) === -1) {
@@ -1743,21 +1772,26 @@ 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;
-                        }
-                        have = true;
                         tasks.push(async (input) => {
+                            let pidKey = `[${room.name} ${pid}]`
+                            if (taskPids.includes(pid)) {
+                                console.log(warnStr(`Skip ${pidKey} Cause Duplicate Pid`))
+                                return;
+                            }
+                            console.log(infoStr(pidKey))
+                            taskPids.push(pid);
                             let jsir = room.jsirs[pid];
-                            console.log(infoStr(`[${pid}]`))
                             let resp = await Room.reqNode(room.selfNode, "post", "/enter", jsir.port, JSON.stringify({input}))
                             console.log(JSON.parse(resp).output)
                         })
                     }
                 }
-                let inputStr = trim(inputArgs.join(" "))
-                let input = have ? (inputStr || await nextLine(i => i)):''
+                if (tasks.length === 0) {
+                    console.warn('no items')
+                    return;
+                }
+                let inputStr = args.slice(1).join(' ')
+                let input = inputStr || await nextLine(i => i)
                 if (vl(input)) {
                     for (let task of tasks) {
                         try {
@@ -2006,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) {
@@ -2378,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];
 }
@@ -2410,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,17 +44,17 @@ 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()
                 }
             })
         } catch (e) {
-            console.$debug("initRoute failed", e)
+            console.$error("initRoute failed", e)
         }
         _onRoom();
     }
@@ -79,7 +79,7 @@ function offRoom() {
         setting.roomTid[0] = null
         if (setting.server) {
             setting.server.close(() => {
-                console.$debug('Existing server shut down.');
+                console.$log('Existing server shut down.');
             });
         }
     }
@@ -112,15 +112,17 @@ async function initNodes() {
         } catch (e) {
             console.$debug("initNodes", e)
         }
+        let isFirst = true
         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])) {
+                let offline = line.indexOf('offline') !== -1 || line.indexOf('active') === -1
                 nodes[ss[0]] = {
                     name: ss[1],
-                    offline,
+                    offline: !isFirst && offline,
                     account: ss[2]
                 }
+                isFirst = false
             }
         }
     }
@@ -581,14 +583,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/server.js

@@ -103,7 +103,7 @@ async function createServer(port) {
     return await new Promise((resolve, reject) => {
         server.listen(port, () => {
             const address = server.address();
-            console.$debug(`Server listening on port ${address.port}`);
+            console.$log(`Server listening on port ${address.port}`);
             resolve(server)
         });
         server.on('error', (err) => {
@@ -149,7 +149,7 @@ function setRoute(method, url, fn, isApi = false, handler = jsonHandle) {
             isApi
         };
     }
-    console.$debug(`setRoute: ${method.toUpperCase()} ${url} ${handler ? handler.name:''}`);
+    console.$log(`setRoute: ${method.toUpperCase()} ${url} ${handler ? handler.name:''}`);
     return setting.server;
 }
 

package/deps/util.js

@@ -136,10 +136,10 @@ const $error = createLimitLogger(`${setting.name}.error`, {
     error: true,
     syncLogs: [$log]
 });
-const $errorOnly = createLimitLogger(`${setting.name}.error`, {
-    logInfo: false,
-    error: true
-});
+// const $errorOnly = createLimitLogger(`${setting.name}.error`, {
+//     logInfo: false,
+//     error: true
+// });
 
 const roomLog = createLimitLogger(`room.log`, {
     logInfo: false
@@ -285,17 +285,17 @@ function createConsole(uniqueName, _logToFile, _errorToFile) {
     result.$draft = draftLog;
     result.$abort = () => false;
     if (uniqueName) {
-        let pair = parseUniqueName(uniqueName)
-        let fileName = pair[0] + '/' +  pair[1].split(".")[0]
-        logToFile = createLimitLogger(fileName + '.log', {
-            logInfo: false,
-            syncLogs: [$log]
-        });
-        errorToFile = createLimitLogger(fileName + '.error', {
-            logInfo: false,
-            error: true,
-            syncLogs: [logToFile, $errorOnly]
-        });
+        // let pair = parseUniqueName(uniqueName)
+        // let fileName = pair[0] + '/' +  pair[1].split(".")[0]
+        // logToFile = createLimitLogger(fileName + '.log', {
+        //     logInfo: false,
+        //     syncLogs: [$log]
+        // });
+        // errorToFile = createLimitLogger(fileName + '.error', {
+        //     logInfo: false,
+        //     error: true,
+        //     syncLogs: [logToFile, $errorOnly]
+        // });
         const promptId = setting.promptId;
         result.$abort = () => promptId !== setting.promptId;
     }
@@ -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]
@@ -629,6 +633,7 @@ async function draftModify(fLine) {
         fs.writeFileSync(tempPath, results[0].split(/\n/).slice(1).join('\n'))
         await eia(getEditor(), [`"${tempPath}"`], true)
         let tempText = String(fs.readFileSync(tempPath))
+        fs.writeFileSync(tempPath, '')
         let lineRange = lineRanges.get(results[0]);
         let before = allLines.filter((_, index) => {
             return index < lineRange.start;
@@ -844,7 +849,7 @@ function createLimitLogger(fileName, {
             setting.newError = true;
         }
         if (time) {
-            let prefix = debugStr(`${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%1000).padStart(3, '0')}>`)
+            let prefix = debugStr(`${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%100000).padStart(5, '0')}>`)
             text = `${prefix} ${text}`
         }
         fp.appendFile(logPath, text + '\n')
@@ -2065,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 ')
         ;
 }
@@ -2249,6 +2260,10 @@ function currentRooms() {
     return JSON.parse(JSON.stringify(setting.rooms));
 }
 
+function uid() {
+    return Date.now().toString(36) + Math.random().toString(36).slice(2, 10).padEnd(8, '0');
+}
+
 module.exports = {
     formatSec,
     wrapperJsirText,
@@ -2369,5 +2384,7 @@ module.exports = {
     formatMb,
     currentJsir,
     currentRoom,
-    currentRooms
+    currentRooms,
+    uid,
+    consoleStrs
 }

package/package.json

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