jsir 2.6.2 → 2.6.4

package/cmd/oaa.js

@@ -173,6 +173,7 @@ async function start() {
     checkWorkspaces()
     initWorkspace()
 
+    await Room.initNodes();
     await Room.syncSetting();
 
     lastFilterArg = getConfig("lastFilterArg");
@@ -377,14 +378,23 @@ function closeRl() {
 function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
     if (!setting.enableNextLine) {
         console.$log(warnStr("[warn]"), "NextLine Disabled");
-        return
+        resolve(null);
+        return;
     }
-    end = trim(end)
     if (!_haveWrapperInput) {
-        return
+        console.$error(errorStr("[error]"), "NextLine Blocked");
+        resolve(null);
+        return;
     }
     initRl(callback, promptStr, hidden);
-    _haveWrapperInput = false
+    let isJsirNext = !callback || callback === wrapperInput
+    if (!isJsirNext) {
+        _haveWrapperInput = false
+    }
+    if (isJsirNext) {
+        global.$newInput = true;
+    }
+    end = trim(end)
     let inputStr = ''
     let lineHandler = async line => {
         let textLine = line
@@ -410,7 +420,7 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
                 inputStr = '.e ' + inputStr;
             }
             let pro = (callback || wrapperInput)(inputStr);
-            resolve && resolve(inputStr);
+            resolve(inputStr);
             try {
                 await pro;
             } finally {
@@ -476,6 +486,24 @@ function resetCmdMap(cmdMap = {}) {
     _cmdMap = cmdMap;
 }
 
+function moveConfig(old, _new) {
+    let configDir = getConfigDir();
+    let uniqueOld = toUniqueName(old);
+    let uniqueNew = toUniqueName(_new);
+
+    let configFileOld = configDir + '/' + md5(uniqueOld) + '.json';
+    let configFileNew = configDir + '/' + md5(uniqueNew) + '.json';
+    if (fs.existsSync(configFileOld) && !fs.existsSync(configFileNew)) {
+        fs.renameSync(configFileOld, configFileNew)
+    }
+
+    let configFileOldTest = configDir + '/' + md5(uniqueOld + '.test') + '.json';
+    let configFileNewTest = configDir + '/' + md5(uniqueNew + '.test') + '.json';
+    if (fs.existsSync(configFileOldTest) && !fs.existsSync(configFileNewTest)) {
+        fs.renameSync(configFileOldTest, configFileNewTest)
+    }
+}
+
 function rename(dir, oldName, newName) {
     let old = dir + '/' + oldName;
     let _new = dir + '/' + newName;
@@ -484,15 +512,7 @@ function rename(dir, oldName, newName) {
     } else {
         fs.renameSync(old, _new)
         console.info(`${_new} renamed`)
-
-        let configDir = getConfigDir();
-        let uniqueOld = toUniqueName(old);
-        let uniqueNew = toUniqueName(_new);
-        let configFileOld = configDir + '/' + md5(uniqueOld) + '.json';
-        let configFileNew = configDir + '/' + md5(uniqueNew) + '.json';
-        if (fs.existsSync(configFileOld) && !fs.existsSync(configFileNew)) {
-            fs.renameSync(configFileOld, configFileNew)
-        }
+        moveConfig(old, _new);
     }
     resetCmdMap({
         1:  toUniqueName(_new)
@@ -578,12 +598,7 @@ async function wrapperInput(str) {
 }
 
 function wrapperAlias(str) {
-    let aliasMap = null;
-    try {
-        aliasMap = getConfig("alias");
-    } catch (e) {
-        console.$error("getAlias failed ", e);
-    }
+    let aliasMap = getConfig("alias");
     if (!aliasMap || Object.keys(aliasMap).length <= 0) {
         return str;
     }
@@ -593,7 +608,6 @@ function wrapperAlias(str) {
 
 async function _wrapperInput(str) {
     _haveWrapperInput = true;
-    global.$newInput = true;
     str = trim(str)
     if (!str) {
         return;
@@ -645,7 +659,7 @@ async function _wrapperInput(str) {
             } else if (firstName === setting.exeKey) {
                 await runCmd(str)
             } else if (firstName === setting.initKey) {
-                await runInit(uniqueName, strs[1])
+                await runInit(uniqueName, enrichArgs(str).slice(1))
             } else {
                 console.log(String(fs.readFileSync(path)));
             }
@@ -655,20 +669,44 @@ async function _wrapperInput(str) {
     }
 }
 
-async function runInit(uniqueName, arg) {
+async function runInit(uniqueName, args) {
+    let arg = args[0]
     if (arg === '-') {
         await offServer(uniqueName)
     } else {
-        await joinServer(uniqueName, arg === '+')
+        let exportLib = await _requireSource(setting.defaultSpace, uniqueName, true);
+        if (typeof exportLib === "function") {
+            await execLibFn(exportLib, args)
+        } else if (exportLib && exportLib[arg]) {
+            await execLibFn(exportLib[arg], args.slice(1))
+        } else if (!arg || arg === '+') {
+            await joinServer(uniqueName, arg === '+', exportLib)
+        } else {
+            console.warn("no items")
+        }
     }
 }
 
-async function joinServer(uniqueName, isApi) {
+async function execLibFn(fn, fnArgs) {
+    for (let i = 0; i < fnArgs.length; i++) {
+        let item = fnArgs[i]
+        if (item.endsWith('   ')) {
+            fnArgs[i] = await evalText('return ' + item.trim())
+        } else {
+            fnArgs[i] = item.trim()
+        }
+    }
+    let result = await fn(...fnArgs);
+    if (vl(result)) {
+        console.log(result)
+    }
+}
+
+async function joinServer(uniqueName, isApi, exportLib) {
     Room.onRoom();
     if (!setting.serviceReg.test(uniqueName)) {
         throw 'invalid service name';
     }
-    let exportLib = await _requireSource(setting.defaultSpace, uniqueName, true);
     let asyncFnSize = 0
     for (let key of Object.keys(exportLib)) {
         let val = exportLib[key];
@@ -1222,7 +1260,7 @@ const keywordDef = {
                     console.msg("config service offline")
                 } else if (_cmdMap[args[0]]){
                     let uniqueName = _cmdMap[args[0]];
-                    await eia(getEditor(), [`${getConfigDir()}/${md5(uniqueName)}.json`])
+                    await eia(getEditor(), [`${getConfigDir()}/${md5(uniqueName + (global.$TEST ? '.test':''))}.json`])
                 } else {
                     console.warn('invalid args')
                 }
@@ -1314,7 +1352,7 @@ const keywordDef = {
                 for (let un of [uniqueName, ...cmds]) {
                     let path = getFullPath(un);
                     let text = removeComment(String(fs.readFileSync(path)))
-                    let [space] = parseUniqueName(uniqueName)
+                    let [space] = parseUniqueName(un)
 
                     text = wrapperJsirText(text)
 
@@ -1448,7 +1486,7 @@ const keywordDef = {
                 } else {
                     let typeKey = getJsirTypeKey(parseUniqueName(cmds[0])[1]);
                     if (setting.initKey === typeKey) {
-                        await runInit(cmds[0], args[1])
+                        await runInit(cmds[0], args.slice(1))
                     } else if (setting.exeKey === typeKey) {
                         await runScript(cmds[0], args.slice(1))
                     }
@@ -1540,15 +1578,49 @@ const keywordDef = {
     debug: {
         comment: 'debug mode',
         exeFn: (args) => {
-            if (global.$DEBUG) {
-                delTips("DEBUG")
+            if ('+' === args[0]) {
+                if (!global.$DEBUG) {
+                    global.$DEBUG = true;
+                    setTips("DEBUG", "DEBUG", () => delete global.$DEBUG);
+                }
+            } else if ('-' === args[0]) {
+                if (global.$DEBUG) {
+                    delTips("DEBUG")
+                }
             } else {
-                global.$DEBUG = true;
-                setTips("DEBUG", "DEBUG", () => delete global.$DEBUG);
+                if (global.$DEBUG) {
+                    delTips("DEBUG")
+                } else {
+                    global.$DEBUG = true;
+                    setTips("DEBUG", "DEBUG", () => delete global.$DEBUG);
+                }
             }
         },
         short: 'D'
     },
+    test: {
+        comment: 'test mode',
+        exeFn: (args) => {
+            if ('+' === args[0]) {
+                if (!global.$TEST) {
+                    global.$TEST = true;
+                    setTips("TEST", "TEST", () => delete global.$TEST);
+                }
+            } else if ('-' === args[0]) {
+                if (global.$TEST) {
+                    delTips("TEST")
+                }
+            } else {
+                if (global.$TEST) {
+                    delTips("TEST")
+                } else {
+                    global.$TEST = true;
+                    setTips("TEST", "TEST", () => delete global.$TEST);
+                }
+            }
+        },
+        short: 'T'
+    },
     room: {
         comment: 'manage room ([node])',
         exeFn: async (args) => {
@@ -1605,15 +1677,8 @@ function getQuickRunCmds(input, matchStr) {
     } else if (input.startsWith("/")) {
         matchStr = '/' + matchStr;
     }
-    return filterCmd(matchStr).filter(i => {
-        let types
-        if (setting.serviceReg.test(i)) {
-            types = [setting.exeKey, setting.initKey];
-        } else {
-            types = [setting.exeKey]
-        }
-        return types.includes(getJsirTypeKey(parseUniqueName(i)[1]))
-    })
+    return filterCmd(matchStr).filter(i =>
+        [setting.exeKey, setting.initKey].includes(getJsirTypeKey(parseUniqueName(i)[1])))
 }
 
 async function preLoad(text, fnNameMatch, fn, packages = [], space) {
@@ -2207,7 +2272,7 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
     let typeKey = getJsirTypeKey(pair[1]);
     if (typeKey === setting.initKey) {
         let pair = parseUniqueName(uniqueName)
-        if (setting.defaultSpace === 'local' || force) {
+        if (global.$TEST || force) {
             result = await evalText(text, uniqueName)
         } else {
             if (setting.serviceReg.test(uniqueName)) {

package/deps/room.js

@@ -8,10 +8,7 @@ const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
 const jsirNodesFile = "jsirNodes.json"
 const roomTasksFile = "roomTasks.json"
-const roomTasksLockKey = "LOCK_roomTasks.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
-const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
-const syncConfigsLockKey = "SyncConfigs_" + getConfigDir();
 const updateRoomInfoLockKey = "UPDATE_" + roomDataFile
 const console = createConsole();
 const setting = require('../deps/setting')
@@ -118,26 +115,36 @@ function getSelfIP(nodes) {
     return ips[0] || '127.0.0.1'
 }
 
-async function getTailscaleNodes() {
-    let resp = await e(`${tailscalePath} status`);
+async function initNodes() {
     let nodes = {}
-    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,
-                account: ss[2]
+    let configNodes = getConfig("nodes", []).map(trim).filter(i => i)
+    if (configNodes.length > 0) {
+        for (const node of configNodes) {
+            let ss = node.split("@").map(trim).filter(i => i);
+            nodes[ss[1]] = {}
+            if (ss.length > 1) {
+                nodes[ss[1]].account = ss[0]
+            }
+        }
+    } else {
+        let resp = await e(`${tailscalePath} status`);
+        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,
+                    account: ss[2]
+                }
             }
         }
     }
-    return nodes;
+    setting.nodeMap = await fileJson("jsirNodes.json", obj => nodes);
 }
 
 async function updateRoomInfo() {
-    setting.nodeMap = await getTailscaleNodes();
-    await fileJson("jsirNodes.json", obj => setting.nodeMap);
+    await initNodes();
     let nodes = Object.keys(setting.nodeMap)
     let ip = getSelfIP(nodes)
     await fileJson(roomDataFile, async room => {
@@ -145,13 +152,9 @@ async function updateRoomInfo() {
             jsirs: room.jsirs
         }
         // 设置roomName
-        let name = setting.nodeMap[ip]?.name || os.hostname();
-        if (!vl(room.name) || room.name !== name) {
-            room.name = name;
-            debug("set roomName", name)
-        }
+        room.name = setting.nodeMap[ip]?.name || os.hostname();
         room.selfNode = ip;
-        room.lastUpdateTime = Date.now()
+        room.lastUpdateTime = setting.roomTime
         debug("init room", room.name)
 
         await cleanRoom(room)
@@ -224,7 +227,6 @@ async function syncRooms() {
 }
 
 async function syncSetting() {
-    setting.nodeMap = await getTailscaleNodes();
     let room = await fileJson(roomDataFile)
     await fileLock(roomsDirLockKey, async () => await _syncSetting(room));
 }
@@ -321,6 +323,7 @@ async function processTasks() {
 }
 
 async function initRoom() {
+    setting.roomTime = Date.now();
     setting.nodeMap = await fileJson(jsirNodesFile);
     let roomUpdateTouchTime = false;
     await fileJson(roomDataFile, async room => {
@@ -329,18 +332,20 @@ async function initRoom() {
             roomUpdateTouchTime = true;
         }
     })
-    if (defTasks) {
-        fileLock(roomTasksLockKey, processTasks, false)
-    }
-
     if (roomUpdateTouchTime) {
-        await fileLock(updateRoomInfoLockKey, updateRoomInfo, false)
-        fileLock(syncRoomsLockKey, syncRooms, false);
-        if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
-            fileLock(syncConfigsLockKey, syncConfigs, false);
-        }
+        fileLock(updateRoomInfoLockKey, async () => {
+            await updateRoomInfo()
+            let pros = []
+            pros.push(syncRooms())
+            if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
+                pros.push(syncConfigs())
+            }
+            await Promise.all(pros);
+        }, false)
+    }
+    if (defTasks) {
+        await processTasks();
     }
-
     await syncSetting();
 }
 
@@ -436,7 +441,7 @@ async function initRoomJsir(room) {
         }, {}),
         busy: await getEventLoopDelay() || (lastJsir ? lastJsir.busy:0),
         back: isRunningInBackground(),
-        lastUpdateTime: Date.now(),
+        lastUpdateTime: setting.roomTime,
         port: setting.server ? setting.server.address()?.port:null,
         services: services,
         newError: global.$newError,
@@ -595,5 +600,6 @@ module.exports = {
     syncSetting,
     reqNode,
     reqFn,
-    localConfigs
+    localConfigs,
+    initNodes
 }

package/deps/setting.js

@@ -39,6 +39,7 @@ module.exports = {
         '/': 2000
     },
     roomTimer: 2000,
+    roomTime: Date.now(),
     serverSignExpire: 6000,
     roomHeartbeatExpire: 9000,
     configMainFnKey: "config/main",

package/deps/util.js

@@ -233,7 +233,12 @@ function createConfig(uniqueName) {
     }
     if (uniqueName) {
         result.local = (key, defaultVal) => {
-            return _getConfig(key, defaultVal, uniqueName);
+            try {
+                return _getConfig(key, defaultVal, uniqueName);
+            } catch (e) {
+                console.$error(`getConfig [${uniqueName}] "${key}" failed`, e)
+            }
+            return defaultVal;
         }
     }
     return result;
@@ -580,14 +585,8 @@ function trimEmptyLine(text) {
     return lines.slice(start, end + 1).join('\n');
 }
 
-let defaultEditor = "vi";
 function getEditor() {
-    try {
-        defaultEditor = getConfig("defaultEditor", "vi");
-    } catch (e) {
-        console.$error('getEditor failed', e);
-    }
-    return defaultEditor
+    return getConfig("defaultEditor", "vi")
 }
 
 function timeStr(fmt, date) {
@@ -722,7 +721,7 @@ function createDirs(filePath) {
 }
 
 function createLimitLogger(fileName, {
-    maxChars = 512 * 1024 * 1024,
+    maxChars = 128 * 1024 * 1024,
     logInfo = true,
     time = true,
     error = false,
@@ -985,7 +984,12 @@ function aesDecipher(str, key){
 }
 
 function getConfig(key, defaultVal) {
-    return _getConfig(key, defaultVal)
+    try {
+        return _getConfig(key, defaultVal)
+    } catch (e) {
+        console.$error(`getConfig "${key}" failed`, e)
+    }
+    return defaultVal;
 }
 
 function getConfigDir() {
@@ -1030,7 +1034,7 @@ function _getConfig(key, defaultVal, uniqueName) {
     let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
     if (uniqueName) {
-        configFile = getConfigDir() + "/" + md5(uniqueName) + ".json"
+        configFile = getConfigDir() + "/" + md5(uniqueName + (global.$TEST ? ".test":"")) + ".json"
     }
     if (!fs.existsSync(configFile)) {
         fs.writeFileSync(configFile, JSON.stringify(configInit, null, 2));

package/package.json

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