jsir 2.6.9 → 2.6.11

package/cmd/oaa.js

@@ -13,7 +13,7 @@ const {
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
     getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
     createDetachedProcess, interceptStdStreams,
-    draftModify, isRunningInBackground, fileJson, fileLock, processLock
+    draftModify, isRunningInBackground, fileJson, fileLock, processLock, cleanFileLocks, getMd5Key
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -184,6 +184,8 @@ function checkWorkspaces() {
 }
 
 async function start() {
+    cleanFileLocks();
+
     setting.wrapperInput = wrapperInput;
     interceptStdStreams()
     checkWorkspaces()
@@ -825,17 +827,28 @@ function dealStarGlobal(items, text) {
 }
 
 function wrapperClassLine(className, classLines) {
-    let str = trimText(classLines.join('\n'))
+    let firstNoEmptyLine = classLines.find(i => i.trim()) || '';
+    if (!firstNoEmptyLine || firstNoEmptyLine.startsWith(firstNoEmptyLine.trim().substring(0, 1))) {
+        return classLines;
+    }
+    let spaceLen = firstNoEmptyLine.indexOf(firstNoEmptyLine.trim());
+    classLines = classLines.map(i => {
+        let prefix = i.substring(0, spaceLen);
+        if (prefix.trim()) {
+            return ''
+        } else {
+            return i.substring(spaceLen);
+        }
+    });
     let results = []
-    for (let line of str.split('\n')) {
+    for (let line of classLines) {
         let asyncMethod = false;
         if (line.startsWith("async ")) {
             // 检查是否为异步方法
             asyncMethod = true;
             line = line.replace("async ", "").trim(); // 去除 'async ' 前缀
         }
-        const methodMatch = line.match(/^\w+\s*\(/);
-        if (methodMatch) {
+        if (/^[a-zA-Z_$][a-zA-Z0-9_$]*\s*\(/.test(line)) {
             let prefix = `function ${className}.`;
             if (asyncMethod) {
                 prefix = "async " + prefix;
@@ -848,7 +861,7 @@ function wrapperClassLine(className, classLines) {
     return results;
 }
 
-function wrapperClass(lines) {
+function wrapperClass(lines, wrapperFn, trimClass = true) {
     let results = [];
     let className = null;
     let inClass = false;
@@ -856,12 +869,19 @@ function wrapperClass(lines) {
     let classLines = []
     for (let line of lines) {
         if (line.startsWith("class ")) {
+            if (!trimClass) {
+                results.push(line);
+            }
             inClass = true;
-            className = reget(line, /^class\s+(\w+)/);
+            className = reget(line, /^class\s+([a-zA-Z_$][a-zA-Z0-9_$]*)/);
             continue
         } else if (inClass && line.startsWith("}")) {
             inClass = false
-            results.push(...wrapperClassLine(className, classLines));
+            results.push(...wrapperFn(className, classLines));
+
+            if (!trimClass) {
+                results.push(line);
+            }
             classLines = []
             continue;
         }
@@ -877,7 +897,7 @@ function wrapperClass(lines) {
 
 function dealStarCmd(rows, cmd, filterStr) {
     let content = String(fs.readFileSync(getFullPath(cmd)));
-    let lines = wrapperClass(content.split('\n'));
+    let lines = wrapperClass(content.split('\n'), wrapperClassLine);
     let capturingFunction = false;
     let inMultiLineComment = false;
     let potentialComments = [];
@@ -916,7 +936,7 @@ function dealStarCmd(rows, cmd, filterStr) {
 
         // Check for function start
         if ((line.startsWith('function ') || line.startsWith('async function '))) {
-            let _fnName = reget(line, /function\s+([\w.]+)\s*\(/);
+            let _fnName = reget(line, /function\s+(\S+)\s*\(/);
             let matchKey = _fnName + "(" + getFnArgsStr(lines.slice(index, index + 9).join("\n")) + ")"
             if (isMatch(matchKey, filterStr)) {
                 fnName = _fnName;
@@ -939,7 +959,7 @@ function dealStarCmd(rows, cmd, filterStr) {
             let row = getInfo(functionContent, fnName, fnType);
             let pair = parseUniqueName(cmd);
             row.value = [
-                infoStr(pair[0] + '/' + trimJsirFileName(pair[1])) + ' ' + getCmdMd5Key(parseUniqueName(cmd)[1]),
+                infoStr(pair[0] + '/' + trimJsirFileName(pair[1])) + ' ' + getMd5Key(parseUniqueName(cmd)[1]),
                 [commentContent, row.value].filter(i => trim(i)).join("\n")
             ].filter(i => trim(i)).join("\n");
             rows.push(row);
@@ -1859,7 +1879,7 @@ function getScriptRequires(uniqueName) {
 }
 
 function getComments(i, cmdName, text, cols = [], col) {
-    let docLines = [getCmdMd5Key(parseUniqueName(cmdName)[1]) + " - " + i]
+    let docLines = [getMd5Key(parseUniqueName(cmdName)[1]) + " - " + i]
     text = trim(text)
     docLines.push(...getTextComments(text))
     let argDef = getArgDef(text, cmdName)
@@ -2257,14 +2277,6 @@ function getArgDef(text, uniqueName) {
     return Object.assign(temp, tempOpt)
 }
 
-function getCmdMd5Key(str) {
-    return '0x' + md5(str).substr(0, 8);
-}
-
-function isMd5Key(str) {
-    return /^0x[a-z\d]{8}$/.test(str);
-}
-
 function filterRequire(currSpace, cmdMatchStr) {
     if (typeof cmdMatchStr === 'number') {
         cmdMatchStr = '0x' + pad(8, BigNumber(cmdMatchStr).toString(16), '0');
@@ -2335,17 +2347,60 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
     return result
 }
 
+function _wrapperClassErrorTag(className, lines) {
+    let firstNoEmptyLine = lines.find(i => i.trim()) || '';
+    if (!firstNoEmptyLine || firstNoEmptyLine.startsWith(firstNoEmptyLine.trim().substring(0, 1))) {
+        return lines;
+    }
+    let spaceLen = firstNoEmptyLine.indexOf(firstNoEmptyLine.trim());
+    let prefixMap = {}
+    let ignoreMap = {}
+    lines = lines.map((i, index) => {
+        let prefix = i.substring(0, spaceLen);
+        if (prefix.trim()) {
+            ignoreMap[index] = i;
+            i = ''
+            return i;
+        } else {
+            prefixMap[index] = prefix;
+            i = i.substring(spaceLen);
+        }
+        if (/^[a-zA-Z_$][a-zA-Z0-9_$]*\s*\(/.test(i)) {
+            i = `function ${className}.` + i;
+        } else if (i.startsWith('async ')) {
+            i = `async function ${className}.` + i.replace(/^async /, '');
+        }
+        return i;
+    })
+    lines = _addErrorTag(lines);
+    return lines.map((i, index) => {
+        if (i.startsWith('function ')) {
+            i = i.replace(/^function [^.]+\./, '');
+        } else if (i.startsWith('async function ')) {
+            i = 'async ' + i.replace(/^async function [^.]+\./, '');
+        }
+        return (ignoreMap[index] || prefixMap[index]) + i;
+    })
+}
+
 function addErrorTag(text) {
-    let result = [];
     let lines = text.split(/\n/);
+    lines = wrapperClass(lines, _wrapperClassErrorTag, false)
+    let result= _addErrorTag(lines);
+    return result.join('\n');
+}
+
+function _addErrorTag(lines) {
+    let result = [];
     let functionEnd = true;
     let fnName = '';
+    let fnIsAsync = false;
     let wrapperFn = [];
     for (let i = 0; i < lines.length; i++) {
         let line = lines[i];
         if (line.startsWith("@")) {
             wrapperFn.push(line.substring(1).trim())
-            result.push(null);
+            result.push('');
         } else {
             result.push(line);
         }
@@ -2353,15 +2408,16 @@ function addErrorTag(text) {
         let isSyncFn = line.startsWith('function');
         if (isAsyncFn || isSyncFn) {
             fnName = reget(line, /function\s+([\s\S]+)\s*\(/)
+            fnIsAsync = isAsyncFn;
         }
         if (functionEnd && fnName && (/\)\s*\{$/.test(trim(line)) || (line.startsWith("{") && trim(line) === '{'))) {
             result[i] += 'try{';
             if (wrapperFn.length > 0) {
                 let defaultArgsList = '("'+ fnName +'")';
                 let runner =  `([${wrapperFn.map(i => 'new ' + i + (i.endsWith(")") ? '':defaultArgsList)).join(",")}],`
-                if (isAsyncFn) {
+                if (fnIsAsync) {
                     result[i] += `return await $aopAsync${runner}async ()=>{`;
-                } else if (isSyncFn) {
+                } else {
                     result[i] += `return $aop${runner}()=>{`;
                 }
             }
@@ -2371,10 +2427,11 @@ function addErrorTag(text) {
             result[i] = `${wrapperFn.length > 0 ? '},arguments)':''}}catch(e){throw($errorTag(e,$cmdName+'[${fnName}]'))}` + line;
             functionEnd = true;
             fnName = '';
+            fnIsAsync = false;
             wrapperFn = []
         }
     }
-    return result.filter(i => i !== null).join('\n');
+    return result;
 }
 
 async function evalText($text = '', $cmdName = '', $args = {}) {

package/deps/room.js

@@ -307,6 +307,9 @@ async function processTasks() {
 }
 
 async function initRoom() {
+    if (process.pid === setting.defaultPort) {
+        cleanFileLocks();
+    }
     setting.roomTime = Date.now();
     setting.nodeMap = await fileJson(jsirNodesFile);
     let roomUpdateTouchTime = false;
@@ -320,7 +323,6 @@ async function initRoom() {
     if (roomUpdateTouchTime) {
         fileLock(updateRoomInfoLockKey, async () => {
             let pros = []
-            pros.push(cleanFileLocks())
             pros.push(syncRooms())
             if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
                 pros.push(syncConfigs())

package/deps/util.js

@@ -2259,6 +2259,14 @@ async function aopAsync(items, fn, args) {
     return await runners[i](args)
 }
 
+function getMd5Key(str) {
+    return '0x' + md5(str).substr(0, 8);
+}
+
+function isMd5Key(str) {
+    return /^0x[a-z\d]{8}$/.test(str);
+}
+
 module.exports = {
     formatUptime,
     wrapperJsirText,
@@ -2377,5 +2385,7 @@ module.exports = {
     hasTips,
     tipKeys,
     isPidAlive,
-    cleanFileLocks
+    cleanFileLocks,
+    getMd5Key,
+    isMd5Key
 }

package/package.json

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