jsir 2.6.5 → 2.6.7

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
+    draftModify, isRunningInBackground, fileJson, fileLock, processLock
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -130,7 +130,8 @@ const $data = {
     key: () => Object.keys(_data),
     has: (key) => vl(_data[key]),
     json: fileJson,
-    lock: fileLock
+    lock: fileLock,
+    pLock: processLock
 }
 const $homeDir = getLibDataDir()
 
@@ -442,6 +443,7 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
     _rl.removeAllListeners('line')
     _rl.on('line', lineHandler)
     _rl.prompt()
+    setting.lastOutput = null;
 }
 
 async function nextText(callback, end, hidden) {
@@ -703,7 +705,6 @@ async function execLibFn(fn, fnArgs) {
 }
 
 async function joinServer(uniqueName, isApi, exportLib) {
-    Room.onRoom();
     if (!setting.serviceReg.test(uniqueName)) {
         throw 'invalid service name';
     }
@@ -730,6 +731,7 @@ async function joinServer(uniqueName, isApi, exportLib) {
         }, isApi)
     }
     console.msg(uniqueName, `has become a ${isApi ? "api ":""}service.`);
+    Room.onRoom();
 }
 
 async function offServer(uniqueName) {
@@ -913,8 +915,10 @@ function dealStarCmd(rows, cmd, filterStr) {
             let commentContent = trimText(comments.join('\n'));
             let row = getInfo(functionContent, fnName, fnType);
             let pair = parseUniqueName(cmd);
-            row.value = infoStr(pair[0] + '/' + trimJsirFileName(pair[1])) + ' ' +
-                getCmdMd5Key(parseUniqueName(cmd)[1]) + '\n' + [commentContent, row.value].filter(i => trim(i)).join("\n");
+            row.value = [
+                infoStr(pair[0] + '/' + trimJsirFileName(pair[1])) + ' ' + getCmdMd5Key(parseUniqueName(cmd)[1]),
+                [commentContent, row.value].filter(i => trim(i)).join("\n")
+            ].filter(i => trim(i)).join("\n");
             rows.push(row);
 
             resetState();
@@ -1281,6 +1285,7 @@ const keywordDef = {
                 if (!fs.existsSync(path)) {
                     let cmds = filterCmd(uniqueName);
                     if (cmds.length === 1) {
+                        uniqueName = cmds[0];
                         path = getFullPath(cmds[0])
                     } else {
                         console.warn("no items")
@@ -2048,6 +2053,7 @@ async function getScriptArgs(argDef, oriArgs) {
     let argNames = Object.keys(argDef)
     let exactArgs = {}
     let scriptArgs = {}
+    let argIdx = 0;
     for (let i = 0; i<oriArgs.length; i++) {
         let arg = oriArgs[i]
         let needTrans
@@ -2079,12 +2085,13 @@ async function getScriptArgs(argDef, oriArgs) {
         }
         pair[1] = needTrans ? await evalText( 'return ' + pair[1]):pair[1]
 
-        let curIdx = Object.keys(scriptArgs).length
-        if (argNames[curIdx]) {
-            scriptArgs[argNames[curIdx]] = pair[1]
+        scriptArgs["$" + argIdx] = pair[1]
+        argIdx ++;
+        if (argNames[i]) {
+            scriptArgs[argNames[i]] = pair[1]
         }
         if (pair[0] && argNames.indexOf(pair[0]) !== -1) {
-            delete scriptArgs[argNames[curIdx]]
+            delete scriptArgs[argNames[i]]
             exactArgs[pair[0]] = pair[1]
         }
     }
@@ -2272,7 +2279,7 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
     let typeKey = getJsirTypeKey(pair[1]);
     if (typeKey === setting.initKey) {
         let pair = parseUniqueName(uniqueName)
-        if (global.$TEST || force) {
+        if (force) {
             result = await evalText(text, uniqueName)
         } else {
             if (setting.serviceReg.test(uniqueName)) {
@@ -2310,26 +2317,44 @@ function addErrorTag(text) {
     let lines = text.split(/\n/);
     let functionEnd = true;
     let fnName = '';
+    let wrapperFn = [];
     for (let i = 0; i < lines.length; i++) {
         let line = lines[i];
-        result.push(line);
-        if (line.startsWith('async function') || line.startsWith('function')) {
+        if (line.startsWith("@")) {
+            wrapperFn.push(line.substring(1).trim())
+            result.push(null);
+        } else {
+            result.push(line);
+        }
+        let isAsyncFn = line.startsWith('async function');
+        let isSyncFn = line.startsWith('function');
+        if (isAsyncFn || isSyncFn) {
             fnName = reget(line, /function\s+([\s\S]+)\s*\(/)
         }
         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) {
+                    result[i] += `return await $aopAsync${runner}async ()=>{`;
+                } else if (isSyncFn) {
+                    result[i] += `return $aop${runner}()=>{`;
+                }
+            }
             functionEnd = false;
         }
         if (line.startsWith("}") && !functionEnd) {
-            result[i] = `}catch(e){throw($errorTag(e,$cmdName+'[${fnName}]'))}` + line;
+            result[i] = `${wrapperFn.length > 0 ? '},arguments)':''}}catch(e){throw($errorTag(e,$cmdName+'[${fnName}]'))}` + line;
             functionEnd = true;
             fnName = '';
+            wrapperFn = []
         }
     }
-    return result.join('\n');
+    return result.filter(i => i !== null).join('\n');
 }
 
-async function evalText($text = '', $cmdName = '', $args = []) {
+async function evalText($text = '', $cmdName = '', $args = {}) {
     if ($cmdName) {
         console.$log(`Execute ${$cmdName}`);
     }

package/deps/evalCode.js

@@ -19,7 +19,15 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
 
     const $setTips = $lib.setTips;
     const $delTips = $lib.delTips;
+    const $tips = {
+        set: $lib.setTips,
+        del: $lib.delTips,
+        has: $lib.hasTips,
+        key: $lib.tipKeys
+    }
     const $errorTag = $lib.errorTag;
+    const $aop = $lib.aop;
+    const $aopAsync = $lib.aopAsync;
 
     const $context = {
         $defArgs,
@@ -27,7 +35,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
         $require, $requires, $import,
         $text, $cmdName, $args,
         $nextLine, $nextText,
-        $setTips, $delTips,
+        $setTips, $delTips, $tips,
         $enter, $filterCmd,
         $currentSpace, $defaultSpace, $workspaceMap,
         $homeDir, $lib, $cmdMap

package/deps/room.js

@@ -2,7 +2,7 @@ const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
     getRoomsDir, e, isRunningInBackground,
     batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
-    fileExist, formatUptime
+    fileExist, formatUptime, processLock
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -146,23 +146,21 @@ async function initNodes() {
     setting.nodeMap = await fileJson("jsirNodes.json", obj => nodes);
 }
 
-async function updateRoomInfo() {
+async function updateRoomInfo(room) {
     await initNodes();
     let nodes = Object.keys(setting.nodeMap)
     let ip = getSelfIP(nodes)
-    await fileJson(roomDataFile, async room => {
-        room = {
-            jsirs: room.jsirs
-        }
-        // 设置roomName
-        room.name = setting.nodeMap[ip]?.name || os.hostname();
-        room.selfNode = ip;
-        room.lastUpdateTime = setting.roomTime
-        debug("init room", room.name)
-
-        await cleanRoom(room)
-        return room;
-    })
+    room = {
+        jsirs: room.jsirs
+    }
+    // 设置roomName
+    room.name = setting.nodeMap[ip]?.name || os.hostname();
+    room.selfNode = ip;
+    room.lastUpdateTime = setting.roomTime
+    debug("init room", room.name)
+
+    await cleanRoom(room)
+    return room;
 }
 
 async function syncRooms() {
@@ -333,21 +331,21 @@ async function initRoom() {
         await initRoomJsir(room)
         if (!vl(room.lastUpdateTime) || (Date.now() - room.lastUpdateTime) > setting.roomTimer) {
             roomUpdateTouchTime = true;
+            return await updateRoomInfo(room)
         }
     })
     if (roomUpdateTouchTime) {
         fileLock(updateRoomInfoLockKey, async () => {
-            await updateRoomInfo()
             let pros = []
             pros.push(syncRooms())
             if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
                 pros.push(syncConfigs())
             }
             await Promise.all(pros);
-        }, false)
+        }, false).catch(debug)
     }
-    if (defTasks) {
-        await processTasks();
+    if (defTasks && Object.keys(defTasks).length > 0) {
+        processLock(roomTasksFile, processTasks, false).catch(debug)
     }
     await syncSetting();
 }
@@ -505,58 +503,57 @@ async function reqNode(node, method, url, port, body) {
         hostname: node,
         port: port, // HTTP 默认端口
         path: url,
-        method: method.toUpperCase(),
-        headers: {
-            'sign': createSign()
-        }
+        method: method.toUpperCase()
     };
     let time = Date.now();
     try {
         return await new Promise((resolve, reject) => {
-            try {
-                let timeoutMs = setting.reqNodeTimeouts[url] || setting.reqNodeDefaultTimeout;
-                let timeout = null
-
-                const req = http.request(opt, (res) => {
-                    let data = '';
-                    // 数据块接收
-                    res.on('data', (chunk) => {
-                        data += chunk;
-                    });
-                    // 响应结束
-                    res.on('end', () => {
-                        clearTimeout(timeout)
-                        // 检查响应状态码
-                        if (res.statusCode !== 200) {
-                            reject(errorTag(new Error(data), decodeURIComponent(url)));
-                            return;
-                        }
-                        resolve(data)
-                    });
+            let timeout = null
+
+            let options = {...opt,
+                headers: {
+                    'sign': createSign()
+                }};
+            options.path = encodeURI(opt.path);
+            const req = http.request(options, (res) => {
+                let data = '';
+                // 数据块接收
+                res.on('data', (chunk) => {
+                    data += chunk;
                 });
+                // 响应结束
+                res.on('end', () => {
+                    clearTimeout(timeout)
+                    // 检查响应状态码
+                    if (res.statusCode !== 200) {
+                        reject(errorTag(new Error(data), decodeURIComponent(url)));
+                        return;
+                    }
+                    resolve(data)
+                });
+            });
 
-                // 设置超时逻辑
+            // 设置超时逻辑
+            if (setting.reqNodeTimeouts[url]) {
                 timeout = setTimeout(() => {
                     req.destroy(); // 中断请求
-                }, timeoutMs); // 10秒超时
-
-                // 错误处理
-                req.on('error', (e) => {
-                    clearTimeout(timeout); // 清除超时定时器
-                    if (room) {
-                        setting.disableConnect[node + ":" + port] = Date.now() + setting.disableConnectLimit
-                    }
-                    reject(e)
-                });
+                }, setting.reqNodeTimeouts[url]); // 10秒超时
+            }
 
-                if (body) {
-                    req.write(body)
+            // 错误处理
+            req.on('error', (e) => {
+                clearTimeout(timeout); // 清除超时定时器
+                if (room) {
+                    setting.disableConnect[node + ":" + port] = Date.now() + setting.disableConnectLimit
                 }
-                // 结束请求
-                req.end();
-            } catch (e) {
                 reject(e)
+            });
+
+            if (body) {
+                req.write(body)
             }
+            // 结束请求
+            req.end();
         });
     } finally {
         debug(`Request cost ${Date.now() - time}ms`, JSON.stringify(opt))
@@ -593,7 +590,7 @@ async function reqFn(fnKey, args = []) {
         throw `service function ${fnKey} not found`;
     }
     let resp = await reqNode(target.node, 'post',
-        `/${encodeURI(fnKey)}`, target.port, JSON.stringify(args || []))
+        `/${fnKey}`, target.port, JSON.stringify(args || []))
     return JSON.parse(resp).result;
 }
 

package/deps/setting.js

@@ -34,9 +34,9 @@ module.exports = {
     serviceFns: {},
     enterOutputs: null,
     defaultPort: 52108,
-    reqNodeDefaultTimeout: 33000,
     reqNodeTimeouts: {
-        '/': 2000
+        '/': 2000,
+        '/config/main': 2000
     },
     roomTimer: 2000,
     roomTime: Date.now(),
@@ -44,5 +44,8 @@ module.exports = {
     roomHeartbeatExpire: 9000,
     configMainFnKey: "config/main",
     serviceReg: /[^a-zA-Z]service[^a-zA-Z]|[^a-zA-Z]service$/i,
-    wrapperInput: null
+    wrapperInput: null,
+    lastOutput: null,
+    locks: {},
+    lastChangeFlag: null
 }

package/deps/util.js

@@ -45,7 +45,7 @@ function consoleStrs(...args) {
     }
 
     // 格式化第一个参数
-    if (typeof args[0] === 'string') {
+    if (args.length > 1 && typeof args[0] === 'string' && hasFormat(args[0])) {
         return util.format(...args); // 处理格式化字符串 (%s, %d 等)
     }
 
@@ -59,6 +59,12 @@ function consoleStrs(...args) {
         .join(' ');
 }
 
+// 判断是否包含格式化占位符的函数
+function hasFormat(str) {
+    // 检查是否有 %s, %d, %j 等占位符
+    return /%[sdjifoO%]/.test(str);
+}
+
 class SyncQueue {
     constructor() {
         this.queue = [];
@@ -194,7 +200,7 @@ const _console =Object.assign({}, global.console);
 const _consoleFns= {
     log: {
         fn: _console.log,
-        args: args => args
+        args: args => [consoleStrs(...args)]
     },
     table: {
         fn: _console.log,
@@ -209,7 +215,7 @@ const _consoleFns= {
         args: args => [infoStr('[info]'), dealLevelArgs(infoStr, args)]
     },
     msg: {
-        fn: _console.log,
+        fn: _console.info,
         args: args => [msgStr('[msg]'), dealLevelArgs(msgStr, args)]
     },
     warn: {
@@ -277,6 +283,18 @@ function createConsole(uniqueName) {
             if ('error' === key) {
                 global.$newError = true;
             }
+            let hasFlag = false;
+            let sameFlag = false;
+            if (args.length > 1 && typeof args[0] === 'string' && args[0].length > 2 && args[0].startsWith("*") && args[0].endsWith("*")) {
+                hasFlag = true;
+                let flag = args[0]
+                args = args.slice(1)
+
+                if (!setting.lastChangeFlag || setting.lastChangeFlag === flag) {
+                    sameFlag = true;
+                }
+                setting.lastChangeFlag = flag
+            }
             if (uniqueName && quite) {
                 if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
                     args = ['', ...args]
@@ -289,7 +307,25 @@ function createConsole(uniqueName) {
                 }
             } else {
                 let _args = _consoleFns[key].args(args);
+                let lastOutput = null;
+                if (hasFlag) {
+                    lastOutput = _args.join(" ")
+                    if (!isRunningInBackground() && setting.lastOutput && sameFlag) {
+                        let lines = setting.lastOutput.split('\n').length;
+                        for (let i = 0; i < lines; i++) {
+                            process.stdout.write('\x1b[A\r'+ ' '.repeat(process.stdout.columns))
+                        }
+                        _args[0] = '\r' + _args[0]
+                    }
+                }
+
                 _consoleFns[key].fn(..._args);
+
+                if (hasFlag) {
+                    setting.lastOutput = lastOutput;
+                } else {
+                    setting.lastOutput = null;
+                }
             }
         }
     }
@@ -1044,6 +1080,9 @@ function _getConfig(key, defaultVal, uniqueName) {
     if (key === undefined) {
         return config
     }
+    if (uniqueName) {
+        console.debug(`use ${uniqueName} config "${key}"`)
+    }
     let writeFlag = false
     if (!(key in config)) {
         writeFlag = true
@@ -1193,26 +1232,20 @@ async function _fileLock(key, fn, expireMs = 49000) {
     if (!key || typeof fn !== 'function') {
         throw new Error('invalid arguments');
     }
+    if (expireMs < 1000) {
+        throw new Error("expireMs can not less than 1000")
+    }
 
     let lockKeyDir = getLockKeyDir(key)
     const now = Date.now();
-    const expireAt = expireMs > 0 ? now + expireMs : 0;
+    const expireAt = now + expireMs;
 
     // 1. 尝试判断锁目录是否已存在
     let lockExists = await fileExist(lockKeyDir);
 
     if (lockExists) {
         // 目录存在时，读取文件名中的过期时间戳
-        const storedExpireAt = await readExpireTimestamp(lockKeyDir);
-        if (storedExpireAt === null) {
-            // 理论上不会出现没有“expire-xxxx”文件的情况，除非中途被手动改动
-            // 可以选择强制删除目录，或者直接返回 false
-            return false;
-        }
-        if (storedExpireAt === 0) {
-            // 说明当时设置的是永不过期
-            return false;
-        }
+        const storedExpireAt = await readExpireTimestamp(lockKeyDir) || 0;
         if (storedExpireAt > now) {
             // 说明锁尚未过期
             return false;
@@ -1250,13 +1283,15 @@ async function _fileLock(key, fn, expireMs = 49000) {
 
     // 4. 成功加锁后执行 fn
     try {
-        await fn();
+        await timeLimit([fn()], expireMs)
         return true;
     } finally {
-        // 5. 执行完毕后，手动释放锁目录（也可选择保留到过期自动失效，但一般都建议主动释放）
-        try {
-            await fp.rm(lockKeyDir, { recursive: true, force: true });
-        } catch (_) {}
+        if (Date.now() <= expireAt - 9) {
+            // 5. 执行完毕后，手动释放锁目录（也可选择保留到过期自动失效，但一般都建议主动释放）
+            try {
+                await fp.rm(lockKeyDir, { recursive: true, force: true });
+            } catch (_) {}
+        }
     }
 }
 
@@ -1278,6 +1313,41 @@ async function fileLock(key, fn, wait = true, expireMs = 49000) {
     }
 }
 
+async function processLock(key, fn, wait = true) {
+    `
+    内存锁, 默认一直等待直到加锁成功执行fn
+    wait = false, 加锁失败则不执行fn
+    return void
+    `
+    if (wait) {
+        while (true) {
+            if (await _processLock(key, fn)) {
+                break;
+            }
+            await sleep(9);
+        }
+    } else {
+        await _processLock(key, fn);
+    }
+}
+
+async function _processLock(key, fn) {
+    if (!key || typeof fn !== 'function') {
+        throw new Error('invalid arguments');
+    }
+    key = key.trim();
+    if (setting.locks.hasOwnProperty(key)) {
+        return false;
+    }
+    setting.locks[key] = true;
+    try {
+        await fn();
+        return true;
+    } finally {
+        delete setting.locks[key];
+    }
+}
+
 function removeFirst(array, obj) {
     let deleteIndex
     for(let i = 0;i<array.length;i++) {
@@ -1326,6 +1396,14 @@ function delTips(...keys) {
     }
 }
 
+function hasTips(key) {
+    return setting.tips.hasOwnProperty(key);
+}
+
+function tipKeys() {
+    return Object.keys(setting.tips);
+}
+
 function tipsOnRmCallback(key) {
     let callbacks = _tipsOnRm[key]
     delete _tipsOnRm[key]
@@ -2076,6 +2154,14 @@ function getValTips() {
     let items = [];
     for (let key of Object.keys(setting.tips)) {
         let val = setting.tips[key].map(i => {
+            if (typeof i === 'function') {
+                try {
+                    i = i();
+                } catch (e) {
+                    console.$error(`tips "${key}"`, e);
+                    return '';
+                }
+            }
             let item = trim(i)
             if (item.indexOf(',') !== -1) {
                 item = `[${item}]`;
@@ -2149,6 +2235,28 @@ function formatUptime() {
     }
 }
 
+function aop(items, fn, args) {
+    let runners = [fn]
+    let i = 0
+    for (let item of [...items].reverse()) {
+        const j = i;
+        runners.push((args) => item.run(runners[j], args))
+        i ++;
+    }
+    return runners[i](args)
+}
+
+async function aopAsync(items, fn, args) {
+    let runners = [fn]
+    let i = 0
+    for (let item of [...items].reverse()) {
+        const j = i;
+        runners.push(async (args) => await item.runAsync(runners[j], args))
+        i ++;
+    }
+    return await runners[i](args)
+}
+
 module.exports = {
     formatUptime,
     wrapperJsirText,
@@ -2260,5 +2368,10 @@ module.exports = {
     createDetachedProcess,
     interceptStdStreams,
     draftModify,
-    fileExist
+    fileExist,
+    aop,
+    aopAsync,
+    processLock,
+    hasTips,
+    tipKeys
 }

package/package.json

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