jsir 2.6.13 → 3.0.0

package/cmd/oaa.js

@@ -13,7 +13,8 @@ const {
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
     getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
     createDetachedProcess, interceptStdStreams,
-    draftModify, isRunningInBackground, fileJson, fileLock, processLock, cleanFileLocks, getMd5Key, terminalTitle
+    draftModify, isRunningInBackground, fileJson, fileLock, processLock, cleanFileLocks, getMd5Key, terminalTitle,
+    getFileOpenExe, formatSec, formatMb
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -164,20 +165,6 @@ const $data = {
 }
 const $homeDir = getLibDataDir()
 
-function getFileOpenExe(fileName) {
-    fileName = trim(fileName);
-    let strs = fileName.split('.')
-    let suffix = ''
-    if (strs.length > 1) {
-        suffix = strs[strs.length - 1]
-    }
-    let defaultExe = getConfig("defaultExe", "open");
-    if (!suffix) {
-        return defaultExe
-    }
-    return getConfig(`${suffix}_exe`, defaultExe);
-}
-
 function checkWorkspaces() {
     let localWorkspace = _libDataDir + '/local';
     setting.workspaceMap = {
@@ -198,6 +185,7 @@ function checkWorkspaces() {
 }
 
 async function start() {
+    terminalTitle()
     cleanFileLocks();
 
     setting.wrapperInput = wrapperInput;
@@ -279,7 +267,7 @@ async function watchFile(uniqueName) {
             closeFileWatcher(workFilePath);
         });
     }
-    await e(`"${getFileOpenExe(parseUniqueName(uniqueName)[1])}" "${workFilePath}"`)
+    await eia(getFileOpenExe(), [`"${workFilePath}"`], true)
 }
 
 function getExeStr(oldText, newText) {
@@ -331,8 +319,8 @@ function getExeStr(oldText, newText) {
 }
 
 async function nextLine(callback, promptStr, hidden) {
-    return new Promise(resolve => {
-        _nextLine(callback, promptStr, hidden, resolve)
+    return new Promise((resolve, reject) => {
+        _nextLine(callback, promptStr, hidden, resolve, reject)
     })
 }
 
@@ -342,14 +330,18 @@ function defaultPromptStr(showKey = false) {
     return tips;
 }
 
-function initRl(callback, promptStr, hidden) {
+function initRl(callback, promptStr, hidden, reject) {
     let origin_writeToOutput;
     if (!_rl) {
         _rl = readline.createInterface({
             input: process.stdin,
-            output: process.stdout
+            output: process.stdout,
+            historySize: 1000
         })
         _rl.on("SIGINT", async () => {
+            if (callback !== wrapperInput) {
+                reject('Terminal Interrupt');
+            }
             if (_noAppendNextLine) {
                 setting.promptId = Date.now();
                 await delTips();
@@ -357,7 +349,9 @@ function initRl(callback, promptStr, hidden) {
                 _rl._writeToOutput = origin_writeToOutput;
                 _haveWrapperInput = true;
                 _rl.clearLine(0)
-                nextLine();
+                if (callback === wrapperInput) {
+                    nextLine();
+                }
             }
         });
         _rl.history = _rlHistory
@@ -407,22 +401,20 @@ function closeRl() {
     _rl = null;
 }
 
-function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
+function _nextLine(callback, promptStr, hidden, resolve, reject, end, isText) {
     callback = callback || wrapperInput;
     if (!setting.enableNextLine) {
-        console.$log(warnStr("[warn]"), "NextLine Disabled");
+        console.$warn("NextLine Disabled");
         resolve(null);
         return;
     }
     if (!_haveWrapperInput) {
-        console.$error(errorStr("[error]"), "NextLine Blocked");
+        console.$error("NextLine Blocked");
         resolve(null);
         return;
     }
-    initRl(callback, promptStr, hidden);
-    if (callback === wrapperInput) {
-        terminalTitle()
-    } else {
+    initRl(callback, promptStr, hidden, reject);
+    if (callback !== wrapperInput) {
         _haveWrapperInput = false
     }
     end = trim(end)
@@ -440,7 +432,7 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
         } else {
             inputs.push(line)
         }
-        if (trim(textLine) && (hidden || callback !== wrapperInput)) {
+        if (trim(textLine) && (hidden || isText)) {
             _rl.history = _rl.history.slice(1)
         }
         if (!isText || line === end) {
@@ -474,18 +466,22 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
     _rl.prompt()
     if (callback === wrapperInput) {
         setting.promptId = Date.now();
+        setting.lastOutput = null;
     }
-    setting.lastOutput = null;
 }
 
 async function nextText(callback, end, hidden) {
-    return new Promise(resolve => {
-        _nextLine(callback, '', hidden, resolve, end, true)
+    return new Promise((resolve, reject) => {
+        _nextLine(callback, '', hidden, resolve, reject, end, true)
     })
 }
 
 async function save(args) {
-    let uniqueName = toUniqueName(toJsirFileName(args.join(' ')))
+    let pair = parseUniqueName(args.join(' '));
+    if (pair[0] && !setting.workspaceMap[pair[0]]) {
+        throw 'invalid name'
+    }
+    let uniqueName = toUniqueName(toJsirFileName(pair[1]), pair[0])
     let path = getFullPath(uniqueName)
     if (fs.existsSync(path)) {
         console.warn(`${path} already exist`)
@@ -752,7 +748,7 @@ async function execLibFn(fn, fnArgs) {
 
 async function joinServer(uniqueName, isApi, exportLib) {
     if (!setting.serviceReg.test(uniqueName)) {
-        throw 'invalid service name';
+        return;
     }
     let asyncFnSize = 0
     for (let key of Object.keys(exportLib)) {
@@ -782,7 +778,7 @@ async function joinServer(uniqueName, isApi, exportLib) {
 
 async function offServer(uniqueName) {
     if (!setting.serviceReg.test(uniqueName)) {
-        throw 'invalid service name';
+        return;
     }
     let pair = parseUniqueName(uniqueName)
     let service = `${pair[0]}/${trimJsirFileName(pair[1])}`;
@@ -1041,29 +1037,6 @@ function help(filterFn) {
     }))
 }
 
-function delTipsByIndex(idxs) {
-    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 (setting.tips.hasOwnProperty(index)) {
-            params.push(index)
-        } else if (indexKeyMap[Number(index)]) {
-            params.push(indexKeyMap[Number(index)])
-        } else if (indexKeyMap[keys.length + 1 + Number(index)]) {
-            params.push(indexKeyMap[keys.length + 1 + Number(index)])
-        }
-    }
-    if (idxs.length > 0 && params.length <= 0) {
-        console.warn("no items")
-        return;
-    }
-    return delTips(...params)
-}
-
 function getPackageVersion(space, name) {
     let moduleDir = setting.workspaceMap[space] + '/node_modules'
     let dir = moduleDir + "/" + name;
@@ -1168,13 +1141,14 @@ async function showRooms() {
                 node: room.selfNode,
                 active: room.active,
                 pid: jsir.newError ? errorStr(pidStr):pidStr,
-                up: jsir.upTime || '',
+                up: formatSec(jsir.upTime) || '',
                 version: jsir.version || '',
                 space: jsir.space,
                 running: jsir.active,
                 port: jsir.port,
                 back: jsir.back,
                 busy: jsir.busy,
+                mem: formatMb(jsir.mem) || '',
                 tips: Object.keys(jsir.tips).map(i => infoStr(i) + ': ' + jsir.tips[i]).join('\n'),
                 services: Object.keys(jsir.services || []).map(msgStr).join('\n')
             });
@@ -1208,7 +1182,24 @@ const keywordDef = {
     clear: {
         comment: 'Clear task',
         exeFn: async (args) => {
-            await delTipsByIndex(args.filter(i => i))
+            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;
+                    }
+                    for (let key of args.slice(1)) {
+                        if (metadata.hasOwnProperty(key)) {
+                            delete metadata[key]
+                        }
+                    }
+                }
+            } else {
+                await delTips(...args)
+            }
         },
         args: {
             tipIndex: 'left prompt index, can be separated by spaces for multiple'
@@ -1300,7 +1291,7 @@ const keywordDef = {
                 console.warn("no items")
             } else {
                 let path = getFullPath(uniqueName)
-                await eia(getEditor(), [path])
+                await eia(getEditor(), [`"${path}"`], true)
             }
         },
         args: {
@@ -1329,12 +1320,12 @@ const keywordDef = {
                     console.msg("config service offline")
                 } else if (_cmdMap[args[0]]){
                     let uniqueName = _cmdMap[args[0]];
-                    await eia(getEditor(), [`${getConfigDir()}/${md5(uniqueName + (global.$TEST ? '.test':''))}.json`])
+                    await eia(getEditor(), [`"${getConfigDir()}/${md5(uniqueName + (global.$TEST ? '.test':''))}.json"`], true)
                 } else {
                     console.warn('invalid args')
                 }
             } else {
-                await eia(getEditor(), [`${getLibDataDir()}/config.json`])
+                await eia(getEditor(), [`"${getLibDataDir()}/config.json"`], true)
             }
         },
         short: 's'
@@ -1346,18 +1337,24 @@ const keywordDef = {
             if (!uniqueName) {
                 console.warn("no items")
             } else {
-                let path = getFullPath(uniqueName)
-                if (!fs.existsSync(path)) {
-                    let cmds = filterCmd(uniqueName);
-                    if (cmds.length === 1) {
-                        uniqueName = cmds[0];
-                        path = getFullPath(cmds[0])
-                    } else {
-                        console.warn("no items")
-                        return;
+                let names = [uniqueName]
+                if (uniqueName === 'ALL') {
+                    names = Object.values(_cmdMap)
+                }
+                for (let uniqueName of names) {
+                    let path = getFullPath(uniqueName)
+                    if (!fs.existsSync(path)) {
+                        let cmds = filterCmd(uniqueName);
+                        if (cmds.length === 1) {
+                            uniqueName = cmds[0];
+                            path = getFullPath(cmds[0])
+                        } else {
+                            console.warn("no items")
+                            return;
+                        }
                     }
+                    await eia(getFileOpenExe(), [`"${path}"`], true)
                 }
-                await e(`"${getFileOpenExe(parseUniqueName(uniqueName)[1])}" "${path}"`)
             }
         },
         args: {
@@ -1374,7 +1371,7 @@ const keywordDef = {
             let bSpace = args[1]
 
             if (aUniqueName && bUniqueName) {
-                let result = await e(`${getConfig("compareExe", "diff")} "${getFullPath(aUniqueName)}" "${getFullPath(bUniqueName)}"`)
+                let result = await eia(getConfig("compareExe", "diff"), [`"${getFullPath(aUniqueName)}"`, `"${getFullPath(bUniqueName)}"`], true)
                 if (result) {
                     console.log(result)
                 }
@@ -1904,26 +1901,36 @@ function getComments(i, cmdName, text, cols = [], col) {
     let docLines = [getMd5Key(parseUniqueName(cmdName)[1]) + " - " + i]
     text = trim(text)
     docLines.push(...getTextComments(text))
-    let argDef = getArgDef(text, cmdName)
-    let comments = getArgComments(argDef, true)
-    if (comments) {
-        docLines.push(...comments)
-    }
-    if (docLines.length > 0) {
-        col.doc = '- ' + docLines[0]
-        if (docLines.length > 1) {
-            cols.push({
-                doc: '  ' + infoStr(docLines[1])
-            })
-            if (docLines.length > 2) {
-                for (let line of docLines.slice(2)) {
-                    cols.push({
-                        doc: '  ' + line
-                    })
-                }
+    col.doc = '- ' + docLines[0]
+    if (docLines.length > 1) {
+        cols.push({
+            doc: '  ' + infoStr(docLines[1])
+        })
+        if (docLines.length > 2) {
+            for (let line of docLines.slice(2)) {
+                cols.push({
+                    doc: '  ' + line
+                })
             }
         }
     }
+
+    // 处理参数
+    let argDef = getArgDef(text, cmdName)
+    let comments = getArgComments(argDef, true)
+    for (let line of comments) {
+        cols.push({
+            doc: '  ' + line
+        })
+    }
+
+    // 处理元数据
+    let metadata = $data.get(cmdName);
+    if (vl(metadata) && typeof metadata === 'object' && Object.keys(metadata).length > 0) {
+        cols.push({
+            doc: '  ' + Object.keys(metadata).map(msgStr).join(' / ')
+        })
+    }
 }
 
 function trimJsirFileName(name) {
@@ -2021,12 +2028,6 @@ function getArgComments(argDef, showShort = false) {
             let item = warnStr(k) + (shortMap[k] ? ` ${warnStr(shortMap[k])}`:'') + (argDef[k] ? ` ${argDef[k]}`:'')
             comments.push(item)
         }
-        comments[0] = comments[0]
-        if (comments.length > 1) {
-            for(let i = 1; i< comments.length; i++) {
-                comments[i] = comments[i]
-            }
-        }
     }
     return comments
 }
@@ -2249,20 +2250,22 @@ function parseArgDef(inputString) {
             result[s1] = '';
         }
     }
+    let tempResult = {}
     for (let key of Object.keys(result)) {
         let comment = result[key];
         let defaultValStr = ''
         if (key.indexOf("=") !== -1) {
-            delete result[key];
             let ss = key.split('=').map(trim);
             key = ss[0]
             defaultValStr = ss[1]
         }
         if (defaultValStr) {
-            result[key] = ['<' + warnStr(defaultValStr) + '>', comment].join(' ')
+            tempResult[key] = ['<' + warnStr(defaultValStr) + '>', comment].join(' ')
+        } else {
+            tempResult[key] = comment
         }
     }
-    return result;
+    return tempResult;
 }
 
 function getArgDef(text, uniqueName) {
@@ -2429,17 +2432,27 @@ function _addErrorTag(lines) {
         } else {
             result.push(line);
         }
-        let isAsyncFn = line.startsWith('async function');
-        let isSyncFn = line.startsWith('function');
+        let isAsyncFn = line.startsWith('async function ');
+        let isSyncFn = line.startsWith('function ');
         if (isAsyncFn || isSyncFn) {
-            fnName = reget(line, /function\s+([\s\S]+)\s*\(/)
+            fnName = reget(line, /function\s+([a-zA-Z_$][a-zA-Z0-9_$.]*)\s*\(/)
             fnIsAsync = isAsyncFn;
         }
         if (functionEnd && fnName && (/\)\s*\{$/.test(trim(line)) || (line.startsWith("{") && trim(line) === '{'))) {
             result[i] += 'try{';
             if (wrapperFn.length > 0) {
                 let defaultArgsList = '("'+ fnName +'")';
-                let runner =  `([${wrapperFn.map(i => 'new ' + i + (i.endsWith(")") ? '':defaultArgsList)).join(",")}],`
+                let runner =  `([${wrapperFn.map(i => {
+                    if (i.endsWith(")")) {
+                        i = i
+                            .replace(/^([^(]+)\(\s*null\s*/, '$1("'+ fnName + '"')
+                            .replace(/^([^(]+)\(\s*undefined\s*/, '$1("'+ fnName + '"')
+                            .replace(/^([^(]+)\(\s*\)/, '$1' + defaultArgsList)
+                    } else {
+                        i += defaultArgsList;
+                    }
+                    return 'new ' + i;
+                }).join(",")}],`
                 if (fnIsAsync) {
                     result[i] += `return await $aopAsync${runner}async ()=>{`;
                 } else {

package/deps/evalCode.js

@@ -17,10 +17,12 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     // 兼容
     $text = $lib.wrapperJsirText($text)
 
-    const $setTips = $lib.setTips;
-    const $delTips = $lib.delTips;
     const $tips = $lib.tipFns;
     const $errorTag = $lib.errorTag;
+
+    // 不在context中
+    const $setTips = $lib.setTips;
+    const $delTips = $lib.delTips;
     const $aop = $lib.aop;
     const $aopAsync = $lib.aopAsync;
 

package/deps/room.js

@@ -1,8 +1,9 @@
 const os = require('os');
-const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
+const {fileJson, fileLock, vl, getKeyTips, getValTips,
     getRoomsDir, e, isRunningInBackground,
-    batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
-    fileExist, formatUptime, processLock, isPidAlive, cleanFileLocks
+    batchAsync, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
+    fileExist, processLock, isPidAlive, cleanFileLocks,
+    roomConsole: console
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -10,7 +11,6 @@ const jsirNodesFile = "jsirNodes.json"
 const roomTasksFile = "roomTasks.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
 const updateRoomInfoLockKey = "UPDATE_" + roomDataFile
-const console = createConsole();
 const setting = require('../deps/setting')
 const fp = require('fs').promises
 const http = require('http');
@@ -19,12 +19,6 @@ const tailscalePath = os.platform() === 'darwin' ?
 const packageJson = require("../package.json");
 const defTasks = getConfig("tasks");
 
-function debug(...args) {
-    if (global.$DEBUG) {
-        console.$log(debugStr('[debug]'), ...args);
-    }
-}
-
 async function localConfigs() {
     let configDir = getConfigDir();
     let configFiles = await fp.readdir(configDir)
@@ -61,7 +55,7 @@ function onRoom() {
                 }
             })
         } catch (e) {
-            debug("initRoute failed", e)
+            console.$debug("initRoute failed", e)
         }
         _onRoom();
     }
@@ -72,7 +66,7 @@ function _onRoom() {
         try {
             await initRoom();
         } catch (e) {
-            debug('initRoom', e)
+            console.$debug('initRoom', e)
         }
         if (setting.roomTid[0]) {
             _onRoom();
@@ -86,7 +80,7 @@ function offRoom() {
         setting.roomTid[0] = null
         if (setting.server) {
             setting.server.close(() => {
-                debug('Existing server shut down.');
+                console.$debug('Existing server shut down.');
             });
         }
     }
@@ -113,7 +107,12 @@ async function initNodes() {
             }
         }
     } else {
-        let resp = await e(`${tailscalePath} status`);
+        let resp = '';
+        try {
+            resp = await e(`${tailscalePath} status`);
+        } catch (e) {
+            console.$debug("initNodes", e)
+        }
         for (let line of resp.split("\n").map(trim)) {
             let offline = line.indexOf('offline') !== -1
             let ss = line.split(/\s+/);
@@ -140,7 +139,7 @@ async function updateRoomInfo(room) {
     room.name = setting.nodeMap[ip]?.name || os.hostname();
     room.selfNode = ip;
     room.lastUpdateTime = setting.roomTime
-    debug("init room", room.name)
+    console.$debug("init room", room.name)
 
     await cleanRoom(room)
     return room;
@@ -165,7 +164,7 @@ async function syncRooms() {
                 try {
                     respBody = await reqNode(node, "get", "/");
                 } catch (e) {
-                    debug(`sync ${node} failed:`, e);
+                    console.$debug(`sync ${node} failed:`, e);
                     if (!isDisableConnect(node, setting.defaultPort)) {
                         respBody = await reqNode(node, "get", "/", setting.defaultPort);
                     }
@@ -180,10 +179,10 @@ async function syncRooms() {
                         );
                     }
                     syncRooms.push(currRoom)
-                    debug(`sync ${node} success`);
+                    console.$debug(`sync ${node} success`);
                 }
             } catch (e) {
-                debug(`sync ${node} failed:`, respBody, e);
+                console.$debug(`sync ${node} failed:`, respBody, e);
             }
         })
     }
@@ -203,11 +202,11 @@ async function syncRooms() {
             try {
                 await fp.unlink(roomsDir + '/' + file)
             } catch (e) {
-                debug(e);
+                console.$debug(e);
             }
         }
     }
-    debug('syncRooms done')
+    console.$debug('syncRooms done')
 }
 
 async function syncSetting() {
@@ -248,8 +247,8 @@ async function _syncSetting(room) {
     setting.services = {}
     setting.serviceFns = {}
     for (const room of setting.rooms) {
-        if (setting.nodeMap[room.selfNode]?.offline) {
-            continue
+        if (!room.active) {
+            continue;
         }
         for (const pid of Object.keys(room.jsirs || {})) {
             let jsir = room.jsirs[pid];
@@ -328,10 +327,10 @@ async function initRoom() {
                 pros.push(syncConfigs())
             }
             await Promise.all(pros);
-        }, false).catch(debug)
+        }, false).catch(console.$debug)
     }
     if (defTasks && Object.keys(defTasks).length > 0) {
-        processLock(roomTasksFile, processTasks, false).catch(debug)
+        processLock(roomTasksFile, processTasks, false).catch(console.$debug)
     }
     await syncSetting();
 }
@@ -341,7 +340,7 @@ async function syncConfigs() {
     try {
         configs = await reqFn(setting.configMainFnKey);
     } catch (e) {
-        debug("syncConfigs failed", e)
+        console.$debug("syncConfigs failed", e)
         return;
     }
     let configDir = getConfigDir();
@@ -354,16 +353,16 @@ async function syncConfigs() {
                 let currText = String(await fp.readFile(path));
                 if (currText !== text) {
                     await fp.writeFile(path, text)
-                    debug(`sync ${key} success`);
+                    console.$debug(`sync ${key} success`);
                 }
             } else {
                 await fp.writeFile(path, text)
-                debug(`sync ${key} success`);
+                console.$debug(`sync ${key} success`);
             }
         });
     }
     await batchAsync(fns, 33)
-    debug('syncConfigs done')
+    console.$debug('syncConfigs done')
 }
 
 async function cleanRoom(room) {
@@ -373,10 +372,10 @@ async function cleanRoom(room) {
         let active = Date.now() - (jsir.lastUpdateTime || 0) <= setting.roomHeartbeatExpire;
         if (jsir.back && !active && isPidAlive(pid)) {
             try {
-                debug(`kill inactive jsir ${pid}`)
+                console.$debug(`kill inactive jsir ${pid}`)
                 process.kill(parseInt(pid), 'SIGKILL'); // 强制终止进程
             } catch (e) {
-                debug(`cleanRoom ${pid} failed`, e)
+                console.$debug(`cleanRoom ${pid} failed`, e)
             }
         }
     }
@@ -433,7 +432,8 @@ async function initRoomJsir(room) {
         services: services,
         newError: setting.newError,
         version: packageJson.version,
-        upTime: formatUptime()
+        upTime: process.uptime(),
+        mem: Math.floor(process.memoryUsage().rss / 1024 / 1024)
     }
     room.jsirs[process.pid] = setting.selfJsir
 }
@@ -542,7 +542,7 @@ async function reqNode(node, method, url, port, body) {
             req.end();
         });
     } finally {
-        debug(`Request cost ${Date.now() - time}ms`, JSON.stringify(opt))
+        console.$debug(`Request cost ${Date.now() - time}ms`, JSON.stringify(opt))
     }
 }