jsir 2.4.1 → 2.4.3

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
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -32,6 +33,7 @@ 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'
@@ -599,7 +601,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))
             }
@@ -1442,7 +1448,11 @@ const keywordDef = {
             if (args.length > 1) {
                 _args = args.slice(1)
             }
-            await eia(`cd "${setting.workspaceMap[setting.defaultSpace]}";${cmd}`, _args, true)
+            if (isRunningInBackground()) {
+                console.log(await e(`cd "${setting.workspaceMap[setting.defaultSpace]}";${args.join(' ')}`))
+            } else {
+                await eia(`cd "${setting.workspaceMap[setting.defaultSpace]}";${cmd}`, _args, true)
+            }
         },
         short: 'E'
     },

package/deps/room.js

@@ -74,7 +74,7 @@ function _onRoom() {
         if (setting.roomTid[0]) {
             _onRoom();
         }
-    }, 3000)
+    }, setting.roomTimer)
 }
 
 function offRoom() {
@@ -137,7 +137,12 @@ async function syncRooms() {
         fns.push(async () => {
             let respBody = ''
             try {
-                respBody = await reqNode(node, "get", "/");
+                try {
+                    respBody = await reqNode(node, "get", "/");
+                } catch (e) {
+                    debug(`sync ${node} failed:`, e);
+                    respBody = await reqNode(node, "get", "/", setting.defaultPort);
+                }
                 syncRooms.push(JSON.parse(respBody))
                 debug(`sync ${node} success`);
             } catch (e) {
@@ -327,7 +332,7 @@ function isDisableConnect(node, port) {
 async function reqNode(node, method, url, port, body) {
     let room = setting.rooms.filter(i => i.selfNode === node)[0]
     if (!port) {
-        port = 52108;
+        port = setting.defaultPort;
         if (room) {
             let activeJsir = Object.values(room.jsirs)
                 .filter(i => !isDisableConnect(node, i.port));
@@ -348,7 +353,7 @@ async function reqNode(node, method, url, port, body) {
     debug('reqRoom', JSON.stringify(opt))
     return await new Promise((resolve, reject) => {
         try {
-            let timeoutMs = url === '/' ? 3000:49000;
+            let timeoutMs = setting.reqNodeTimeouts[url] || setting.reqNodeDefaultTimeout;
             let timeout = null
 
             const req = http.request(opt, (res) => {
@@ -378,7 +383,7 @@ async function reqNode(node, method, url, port, body) {
             req.on('error', (e) => {
                 clearTimeout(timeout); // 清除超时定时器
                 if (room) {
-                    setting.disableConnect[node + ":" + port] = Date.now() + 6000
+                    setting.disableConnect[node + ":" + port] = Date.now() + setting.disableConnectLimit
                 }
                 reject(e)
             });

package/deps/server.js

@@ -3,7 +3,7 @@ const {createConsole, vl, aesDecipher, md5, aesCipher, debugStr, isError} = requ
 const console = createConsole();
 const setting = require('../deps/setting')
 // 尝试监听的端口
-const preferredPort = 52108;
+const preferredPort = setting.defaultPort;
 // 路由存储
 const routes = setting.routes;
 let invokeStart = false;
@@ -51,7 +51,7 @@ async function createServer(port) {
                 const decodedTime = verifySign(sign);
                 const currentTime = Date.now();
 
-                if (decodedTime === null || Math.abs(currentTime - decodedTime) > 6000) {
+                if (decodedTime === null || Math.abs(currentTime - decodedTime) > setting.serverSignExpire) {
                     res.writeHead(403, { 'Content-Type': 'text/plain' });
                     res.end('Forbidden: Invalid Sign');
                     return;

package/deps/setting.js

@@ -8,8 +8,6 @@ fileType[exeKey] = "exe";
 fileType[initKey] = "init";
 fileType[fileKey] = "file";
 
-const defaultType = 'note';
-
 module.exports = {
     name: 'jsir',
     libDataDir: '.jsirData',
@@ -17,7 +15,7 @@ module.exports = {
     exeKey,
     initKey,
     fileKey,
-    defaultType,
+    defaultType: 'note',
     packages: {},
     tips: {},
     defaultSpace: 'local',
@@ -28,8 +26,16 @@ module.exports = {
     rooms: [],
     server: null,
     disableConnect: {},
+    disableConnectLimit: 6000,
     routes: {},
     services: {},
     serviceFns: {},
-    enterOutputs: null
+    enterOutputs: null,
+    defaultPort: 52108,
+    reqNodeDefaultTimeout: 9000,
+    reqNodeTimeouts: {
+        '/': 3000
+    },
+    roomTimer: 1000,
+    serverSignExpire: 6000
 }

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)
@@ -1204,7 +1239,7 @@ async function _fileLock(key, fn, expireMs = 49000) {
 
 async function fileLock(key, fn, wait = true, expireMs = 49000) {
     `
-    文件锁, 默认一直等待，直到加锁成功执行fn
+    文件锁, 默认一直等待expireMs，直到加锁成功执行fn
     wait = false, 加锁失败则不执行fn
     return void
     `
@@ -2164,5 +2199,6 @@ module.exports = {
     getJsirTypeKey,
     isRunningInBackground,
     createDetachedProcess,
-    interceptStdStreams
+    interceptStdStreams,
+    draftModify
 }

package/package.json

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