jsir 3.0.4 → 3.0.6

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"
     }
@@ -635,7 +649,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)
         }
@@ -1720,21 +1740,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) {
@@ -1747,17 +1759,26 @@ const keywordDef = {
                             && 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 {
@@ -2592,7 +2613,9 @@ process.on('beforeExit', async function () {
     if (_noAppendNextLine) {
         terminalTitle(null)
     } else {
-        nextLine();
+        if (!isRunningInBackground()) {
+            nextLine();
+        }
         Room.onRoom()
     }
 });

package/deps/room.js

@@ -54,7 +54,7 @@ function onRoom() {
                 }
             })
         } 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.');
             });
         }
     }

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;
     }
@@ -629,6 +629,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 +845,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')
@@ -2249,6 +2250,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 +2374,6 @@ module.exports = {
     formatMb,
     currentJsir,
     currentRoom,
-    currentRooms
+    currentRooms,
+    uid
 }

package/package.json

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