jsir 2.6.13 → 2.6.14

package/cmd/oaa.js

@@ -198,6 +198,7 @@ function checkWorkspaces() {
 }
 
 async function start() {
+    terminalTitle()
     cleanFileLocks();
 
     setting.wrapperInput = wrapperInput;
@@ -420,9 +421,7 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
         return;
     }
     initRl(callback, promptStr, hidden);
-    if (callback === wrapperInput) {
-        terminalTitle()
-    } else {
+    if (callback !== wrapperInput) {
         _haveWrapperInput = false
     }
     end = trim(end)
@@ -485,7 +484,11 @@ async function nextText(callback, end, hidden) {
 }
 
 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`)
@@ -2021,12 +2024,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 +2246,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) {

package/deps/room.js

@@ -113,7 +113,12 @@ async function initNodes() {
             }
         }
     } else {
-        let resp = await e(`${tailscalePath} status`);
+        let resp = '';
+        try {
+            resp = await e(`${tailscalePath} status`);
+        } catch (e) {
+            debug("initNodes", e)
+        }
         for (let line of resp.split("\n").map(trim)) {
             let offline = line.indexOf('offline') !== -1
             let ss = line.split(/\s+/);
@@ -248,8 +253,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];

package/package.json

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