jsir 2.4.2 → 2.4.4

package/cmd/oaa.js

@@ -12,7 +12,8 @@ const {
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
     getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
-    createDetachedProcess, interceptStdStreams
+    createDetachedProcess, interceptStdStreams,
+    draftModify, isRunningInBackground, fileJson, fileLock
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -32,7 +33,6 @@ const console = createConsole();
 const room = require('../deps/room');
 const server = require('../deps/server')
 const {reqNode} = require("../deps/room");
-const {isRunningInBackground} = require("../deps/util");
 
 let lastFilterArg = '';
 let _cmdMapFile = setting.name + 'CmdMap.json'
@@ -116,6 +116,12 @@ const $data = {
         }
         return _dealOnLazyGet(key, onLazyTempCode)
     },
+    gfs: (key, fn, onLazyTempCode) => {
+        if (!vl(_data[key])) {
+            return _dataSet(key,  fn(), onLazyTempCode)
+        }
+        return _dealOnLazyGet(key, onLazyTempCode)
+    },
     set: _dataSet,
     del: (key) => {
         let val = _data[key]
@@ -123,7 +129,9 @@ const $data = {
         return val
     },
     key: () => Object.keys(_data),
-    has: (key) => vl(_data[key])
+    has: (key) => vl(_data[key]),
+    json: fileJson,
+    lock: fileLock
 }
 const $homeDir = getLibDataDir()
 
@@ -600,7 +608,11 @@ async function _wrapperInput(str) {
         } else {
             let fLine = trim(str.substr(1))
             if (fLine) {
-                console.log(draftQuery(fLine).join("\n"))
+                if (/\s+[+-]$/.test(fLine)) {
+                    console.log((await draftModify(fLine)).join("\n"))
+                } else {
+                    console.log(draftQuery(fLine).join("\n"))
+                }
             } else {
                 console.$draft(await nextText(line => line, fstr))
             }

package/deps/evalCode.js

@@ -13,10 +13,6 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     const require = (moduleName) => $lib.requireG(moduleName, $currentSpace);
 
     const $config = $lib.createConfig($cmdName);
-    const $file = {
-        json: $lib.fileJson,
-        lock: $lib.fileLock
-    };
 
     // 兼容
     $text = $lib.wrapperJsirText($text)
@@ -27,7 +23,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
 
     const $context = {
         $defArgs,
-        $data, $config, $file,
+        $data, $config,
         $require, $requires, $import,
         $text, $cmdName, $args,
         $nextLine, $nextText,

package/deps/room.js

@@ -7,7 +7,7 @@ const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
 const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
-const enrichRoomInfoLockKey = "ENRICH_" + roomDataFile
+const updateRoomInfoLockKey = "UPDATE_" + roomDataFile
 const console = createConsole();
 const net = require("net");
 const setting = require('../deps/setting')
@@ -54,7 +54,7 @@ function onRoom(wrapperInput) {
                     await wrapperInput(req.input)
                     let outputs = setting.enterOutputs || [];
                     setting.enterOutputs = null;
-                    res.output = outputs.join('\n');
+                    res.output = outputs.join('');
                 }
             })
         } catch (e) {
@@ -104,7 +104,7 @@ async function getTailscaleNodes() {
     return [...new Set(nodes)];
 }
 
-async function enrichRoomInfo() {
+async function updateRoomInfo() {
     let nodes = await getTailscaleNodes();
     let ip = getSelfIP(nodes)
     await fileJson(roomDataFile, async room => {
@@ -121,6 +121,8 @@ async function enrichRoomInfo() {
 
         // 提前设置一下
         setting.selfRoom = Object.assign(setting.selfRoom || {}, room);
+
+        await cleanRoom(room)
     })
 }
 
@@ -141,10 +143,14 @@ async function syncRooms() {
                     respBody = await reqNode(node, "get", "/");
                 } catch (e) {
                     debug(`sync ${node} failed:`, e);
-                    respBody = await reqNode(node, "get", "/", setting.defaultPort);
+                    if (!isDisableConnect(node, setting.defaultPort)) {
+                        respBody = await reqNode(node, "get", "/", setting.defaultPort);
+                    }
+                }
+                if (respBody) {
+                    syncRooms.push(JSON.parse(respBody))
+                    debug(`sync ${node} success`);
                 }
-                syncRooms.push(JSON.parse(respBody))
-                debug(`sync ${node} success`);
             } catch (e) {
                 debug(`sync ${node} failed:`, respBody, e);
             }
@@ -203,9 +209,9 @@ async function _syncSetting(room) {
     }
     setting.rooms = [setting.selfRoom, ...rooms]
         .map(room => {
-            room.active = Date.now() - (room.lastUpdateTime || 0) <= 9000;
+            room.active = Date.now() - (room.lastUpdateTime || 0) <= setting.roomHeartbeatExpire;
             Object.entries(room.jsirs).forEach(([key, jsir]) =>
-                jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= 9000)
+                jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= setting.roomHeartbeatExpire)
             return room;
         });
 
@@ -238,19 +244,35 @@ async function initRoom() {
     let roomUpdateTouchTime = false;
     await fileJson(roomDataFile, async room => {
         await initRoomJsir(room)
-        if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > 3000) {
+        if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > setting.roomTimer) {
             roomUpdateTouchTime = true;
         }
     })
 
     if (roomUpdateTouchTime) {
-        await fileLock(enrichRoomInfoLockKey, enrichRoomInfo, false)
+        await fileLock(updateRoomInfoLockKey, updateRoomInfo, false)
         fileLock(syncRoomsLockKey, syncRooms, false);
     }
 
     await syncSetting();
 }
 
+async function cleanRoom(room) {
+    // 清理进程
+    for (let pid of Object.keys(room.jsirs || {})) {
+        let jsir = room.jsirs[pid]
+        let active = Date.now() - (jsir.lastUpdateTime || 0) <= setting.roomHeartbeatExpire;
+        if (!active && isPidAlive(pid)) {
+            try {
+                debug(`kill inactive jsir ${pid}`)
+                process.kill(parseInt(pid), 'SIGKILL'); // 强制终止进程
+            } catch (e) {
+                debug(`clearRoom ${pid} failed`, e)
+            }
+        }
+    }
+}
+
 /*
 最小为0
 100 为1 毫秒
@@ -270,6 +292,7 @@ async function initRoomJsir(room) {
         Object.entries(room.jsirs || {}).filter(([pid]) => isPidAlive(pid))
     );
 
+    // 构造services
     let services = {}
     for (let key of Object.keys(setting.routes)) {
         let ss = key.split("/").map(trim).filter(i => i);
@@ -277,6 +300,7 @@ async function initRoomJsir(room) {
             getOr(services, ss[1] + '/' + ss[2], []).push(ss[3])
         }
     }
+    // 初始化jsir
     let lastJsir = room.jsirs[process.pid]
     room.jsirs[process.pid] = {
         pid: process.pid,

package/deps/setting.js

@@ -32,10 +32,11 @@ module.exports = {
     serviceFns: {},
     enterOutputs: null,
     defaultPort: 52108,
-    reqNodeDefaultTimeout: 9000,
+    reqNodeDefaultTimeout: 33000,
     reqNodeTimeouts: {
         '/': 3000
     },
     roomTimer: 1000,
-    serverSignExpire: 6000
+    serverSignExpire: 6000,
+    roomHeartbeatExpire: 9000
 }

package/deps/util.js

@@ -424,6 +424,42 @@ function parseDraftLog(draftPath) {
 }
 
 function draftQuery(fLine) {
+    fLine = fLine.trim();
+    let results = [];
+    let draftPath = getLibDataDir() + "/log/draft.log";
+    if (!fs.existsSync(draftPath)) {
+        return results;
+    }
+
+    let { lines } = parseDraftLog(draftPath);
+    let limit = 0;
+    let filterKeywords = '';
+
+    if (/\s+\d+$/.test(fLine)) {
+        filterKeywords = fLine.replace(/\s+\d+$/, '');
+        limit = parseInt(fLine.match(/\d+$/)[0]);
+    } else {
+        filterKeywords = fLine;
+    }
+
+    if (/^\d+$/.test(filterKeywords)) {
+        results = lines.slice(- parseInt(filterKeywords));
+    } else {
+        lines.forEach(line => {
+            if (isMatch(line, filterKeywords)) {
+                results.push(line);
+            }
+        });
+    }
+
+    if (limit > 0) {
+        results = results.slice(-limit);
+    }
+
+    return results;
+}
+
+async function draftModify(fLine) {
     fLine = fLine.trim();
     let results = [];
     let deleteRanges = [];
@@ -486,7 +522,7 @@ function draftQuery(fLine) {
     if (isEdit && results.length === 1) {
         let tempPath = getLibDataDir() + "/log/draft.temp";
         fs.writeFileSync(tempPath, results[0].split(/\n/).slice(1).join('\n'))
-        ei(getEditor(), [tempPath])
+        await eia(getEditor(), [tempPath])
         let tempText = String(fs.readFileSync(tempPath))
         let lineRange = lineRanges.get(results[0]);
         let before = allLines.filter((_, index) => {
@@ -702,9 +738,8 @@ function createLimitLogger(fileName, {
         if (error) {
             global.$newError = true;
         }
-        text = `${pad(3, String(process.pid%1000), process.pid >= 1000 ? '0':' ')}> ${text}`
         if (time) {
-            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${text}`
+            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${pad(3, String(process.pid%1000), process.pid >= 1000 ? '0':' ')}> ${text}`
         }
         syncQueue(() => fp.appendFile(logPath, text + '\n'), logPath)
         let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
@@ -979,11 +1014,14 @@ function _getConfig(key, defaultVal, uniqueName) {
     if (key === undefined) {
         return config
     }
+    if (uniqueName) {
+        console.msg(`require ${uniqueName} config "${key}"`)
+    }
     let writeFlag = false
     if (!(key in config)) {
         writeFlag = true
         config[key] = null
-        console.warn(`require config "${key}", use .setting`)
+        console.warn(`require ${uniqueName ? uniqueName:'global'} config "${key}"`)
     }
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
@@ -2164,5 +2202,6 @@ module.exports = {
     getJsirTypeKey,
     isRunningInBackground,
     createDetachedProcess,
-    interceptStdStreams
+    interceptStdStreams,
+    draftModify
 }

package/package.json

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