jsir 2.4.9 → 2.5.1

package/cmd/oaa.js

@@ -585,8 +585,7 @@ function wrapperAlias(str) {
         return str;
     }
     let fstr = str.split(/\s+/)[0];
-    fstr = getAlias(aliasMap, fstr);
-    return [fstr, str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
+    return [getAlias(aliasMap, fstr), str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
 }
 
 async function _wrapperInput(str) {
@@ -1405,13 +1404,11 @@ const keywordDef = {
                 }
             }
             let pair = parseUniqueName(keyword)
-            let cmds;
-            if (isMd5Key(pair[1]) || pair[1].indexOf(",") !== -1) {
-                cmds = getQuickRunCmds(keyword, keyword)
-            } else {
-                cmds = getQuickRunCmds(keyword, '^e ' + toJsirFileName(pair[1]) + '$')
+            let cmds = getQuickRunCmds(keyword, pair[1])
+            if (cmds.length > 1) {
+                cmds = getQuickRunCmds(keyword, '^' + toJsirFileName(pair[1]) + '$')
                 if (cmds.length === 0) {
-                    cmds = getQuickRunCmds(keyword, keyword)
+                    cmds = getQuickRunCmds(keyword, '^e[^a-zA-Z]' + toJsirFileName(pair[1]) + '$')
                 }
             }
             if (cmds.length === 1) {
@@ -1421,7 +1418,7 @@ const keywordDef = {
                     await runScript(cmds[0], args.slice(1))
                 }
             } else {
-                console.warn(cmds.length > 1 ? "multiple match" : "no match")
+                console.warn(`require "${keyword}" not unique`)
             }
         },
         args: {
@@ -1470,13 +1467,15 @@ const keywordDef = {
     log: {
         comment: 'View log (type[[lt][le]], index)',
         exeFn: async (args) => {
-            let path = `${getLibDataDir()}/log/jsir`
+            let path = `${getLibDataDir()}/log/room`
             let type = '';
             for (let arg of args) {
                 if (_cmdMap[arg]) {
                     let pair = parseUniqueName(_cmdMap[arg])
                     let fileName = pair[0] + '/' +  pair[1].split(".")[0]
                     path = `${getLibDataDir()}/log/${fileName}`
+                } else if (arg === '0') {
+                    path = `${getLibDataDir()}/log/jsir`
                 } else {
                     type = arg;
                 }
@@ -1633,17 +1632,17 @@ async function _dealKeyword(keyword, args) {
         if (item.short === shortKey) {
             unMatched = false;
             if (item === keywordDef.run) {
-                console.$log('execute', key)
+                console.$log('Execute', key)
                 await item.exeFn(args);
             } else {
-                console.$log('execute', key)
+                console.$log('Execute', key)
                 await item.exeFn(args.map(trim));
             }
             break;
         }
     }
     if (unMatched) {
-        console.$log('execute run', keyword)
+        console.$log('Execute run', keyword)
         await keywordDef.run.exeFn([keyword, ...args])
     }
 }
@@ -2133,25 +2132,24 @@ function filterRequire(currSpace, cmdMatchStr) {
     }
     cmdMatchStr = trim(cmdMatchStr);
 
-    let cmds;
-    let uName = toUniqueName(cmdMatchStr, currSpace)
-    let fullPath = getFullPath(uName)
-    if (fullPath && fs.existsSync(fullPath)) {
-        cmds = [uName]
-    } else {
-        let appointSpace = parseUniqueName(cmdMatchStr)[0]
-        cmds = filterCmd(cmdMatchStr);
-        if (cmds.length > 0) {
-            cmds = cmds.filter(cmd => parseUniqueName(cmd)[0] === (appointSpace || currSpace))
-        }
-        if (cmds.length > 0) {
-            cmds = cmds.filter(cmd => getJsirTypeKey(parseUniqueName(cmd)[1]) === setting.initKey)
-        }
+    let pair = parseUniqueName(cmdMatchStr);
+    let appointSpace = pair[0] || currSpace;
+    let cmds = filterCmd(appointSpace + '/' + pair[1]);
+    if (cmds.length > 1) {
+        cmds = cmds.filter(cmd => [setting.initKey, setting.exeKey].indexOf(getJsirTypeKey(parseUniqueName(cmd)[1])) !== -1)
     }
     if (cmds.length > 1) {
-        throw `multiple match: ${cmdMatchStr}`
-    } else if (cmds.length < 1) {
-        throw `none match: ${cmdMatchStr}`
+        cmds = cmds.filter(cmd => setting.initKey === getJsirTypeKey(parseUniqueName(cmd)[1]))
+    }
+    if (cmds.length > 1) {
+        let jsirFileName = toJsirFileName(pair[1])
+        cmds = filterCmd(appointSpace + '/^' + jsirFileName + "$");
+        if (cmds.length === 0) {
+            cmds = filterCmd(appointSpace + '/^[ei][^a-zA-Z]' + jsirFileName + "$");
+        }
+    }
+    if (cmds.length !== 1) {
+        throw `require "${cmdMatchStr}" not unique`
     }
     return cmds[0];
 }
@@ -2215,6 +2213,9 @@ function addErrorTag(text) {
 }
 
 async function evalText($text = '', $cmdName = '', $args = []) {
+    if ($cmdName) {
+        console.$log(`Execute ${$cmdName}`);
+    }
     let currSpace;
     if ($cmdName) {
         let pair = parseUniqueName($cmdName)

package/deps/room.js

@@ -71,6 +71,7 @@ function onRoom(wrapperInput) {
                     let outputs = setting.enterOutputs || [];
                     setting.enterOutputs = null;
                     res.output = outputs.join('');
+                    global.$newInput = true;
                 }
             })
             if (configMain) {
@@ -246,9 +247,9 @@ async function _syncSetting(room) {
     setting.services = {}
     setting.serviceFns = {}
     for (const room of setting.rooms) {
-        for (const pid of Object.keys(room.jsirs || [])) {
+        for (const pid of Object.keys(room.jsirs || {})) {
             let jsir = room.jsirs[pid];
-            for (const service of Object.keys(jsir.services || [])) {
+            for (const service of Object.keys(jsir.services || {})) {
                 let serviceFns = jsir.services[service] || [];
 
                 let existFns = setting.services[service] || [];
@@ -365,6 +366,10 @@ async function initRoomJsir(room) {
             getOr(services, ss[1], []).push(ss[2])
         }
     }
+    // 去重
+    for (let key of Object.keys(services)) {
+        services[key] = [...new Set(services[key])]
+    }
     // 初始化jsir
     let lastJsir = room.jsirs[process.pid]
     room.jsirs[process.pid] = {
@@ -490,7 +495,7 @@ async function reqNode(node, method, url, port, body) {
             }
         });
     } finally {
-        debug(`reqRoom cost ${Date.now() - time}ms`, JSON.stringify(opt), )
+        debug(`Request cost ${Date.now() - time}ms`, JSON.stringify(opt))
     }
 }
 

package/deps/server.js

@@ -33,6 +33,54 @@ function createSign() {
     }
 }
 
+async function process(routeKey, req, res, params) {
+    if (routes[routeKey]) {
+        if (!apiReg.test(routeKey)) {
+            // 如果不是api接口，则校验签名
+            // 取header里的sign字段
+            const sign = req.headers['sign'];
+            if (sign) {
+                const decodedTime = verifySign(sign);
+                const currentTime = Date.now();
+
+                if (decodedTime === null || Math.abs(currentTime - decodedTime) > setting.serverSignExpire) {
+                    res.writeHead(403, {'Content-Type': 'text/plain'});
+                    res.end('Forbidden: Invalid Sign');
+                    return;
+                }
+            } else {
+                // 如果没有sign字段，返回403
+                res.writeHead(403, {'Content-Type': 'text/plain'});
+                res.end('Forbidden: Missing Sign');
+                return;
+            }
+        }
+        // 如果签名通过，继续处理请求
+        try {
+            let body = '';
+            await new Promise((resolve, reject) => {
+                // 监听请求数据
+                req.on('data', chunk => {
+                    body += chunk;
+                });
+                req.on('error', (err) => {
+                    reject(err)
+                });
+                req.on('end', async () => {
+                    resolve()
+                })
+            })
+            await routes[routeKey](body || params, res);
+        } catch (e) {
+            res.writeHead(500, {'Content-Type': 'text/plain'});
+            res.end(String(isError(e) ? e.message : e));
+        }
+    } else {
+        res.writeHead(404, {'Content-Type': 'text/plain'});
+        res.end('Not Found');
+    }
+}
+
 // 创建一个 HTTP 服务
 async function createServer(port) {
     const server = http.createServer(async (req, res) => {
@@ -51,52 +99,11 @@ async function createServer(port) {
         const clientIp = req.socket.remoteAddress || req.connection.remoteAddress;
         // 查找对应的路由处理函数
         const routeKey = `${method} ${url}`;
-        debug(`Received ${routeKey} from ${clientIp}`);
-
-        if (routes[routeKey]) {
-            if (!apiReg.test(routeKey)) {
-                // 如果不是api接口，则校验签名
-                // 取header里的sign字段
-                const sign = req.headers['sign'];
-                if (sign) {
-                    const decodedTime = verifySign(sign);
-                    const currentTime = Date.now();
-
-                    if (decodedTime === null || Math.abs(currentTime - decodedTime) > setting.serverSignExpire) {
-                        res.writeHead(403, { 'Content-Type': 'text/plain' });
-                        res.end('Forbidden: Invalid Sign');
-                        return;
-                    }
-                } else {
-                    // 如果没有sign字段，返回403
-                    res.writeHead(403, { 'Content-Type': 'text/plain' });
-                    res.end('Forbidden: Missing Sign');
-                    return;
-                }
-            }
-            // 如果签名通过，继续处理请求
-            try {
-                let body = '';
-                await new Promise((resolve, reject) => {
-                    // 监听请求数据
-                    req.on('data', chunk => {
-                        body += chunk;
-                    });
-                    req.on('error', (err) => {
-                        reject(err)
-                    });
-                    req.on('end', async () => {
-                        resolve()
-                    })
-                })
-                await routes[routeKey](body || params, res);
-            } catch (e) {
-                res.writeHead(500, { 'Content-Type': 'text/plain' });
-                res.end(String(isError(e) ? e.message:e));
-            }
-        } else {
-            res.writeHead(404, { 'Content-Type': 'text/plain' });
-            res.end('Not Found');
+        let time = Date.now();
+        try {
+            await process(routeKey, req, res, params);
+        } finally {
+            debug(`Process cost ${Date.now() - time}ms for ${routeKey} from ${clientIp}`);
         }
     });
 

package/deps/util.js

@@ -96,13 +96,23 @@ function syncQueue(task, key) {
     return queue.enqueue(task)
 }
 
-const $log = createLimitLogger(`${setting.name}.log`, {
+const roomLog = createLimitLogger(`room.log`, {
     logInfo: false
 });
+const roomError = createLimitLogger(`room.error`, {
+    logInfo: false,
+    error: true,
+    syncLogs: [roomLog]
+});
+
+const $log = createLimitLogger(`${setting.name}.log`, {
+    logInfo: false,
+    syncLogs: [roomLog]
+});
 const $error = createLimitLogger(`${setting.name}.error`, {
     logInfo: false,
     error: true,
-    syncLogs: [$log]
+    syncLogs: [$log, roomError]
 });
 let _globalDraft= createLimitLogger(`draft.log`, {
     logInfo: false,
@@ -236,12 +246,13 @@ function createConsole(uniqueName) {
         let pair = parseUniqueName(uniqueName)
         let fileName = pair[0] + '/' +  pair[1].split(".")[0]
         result.$log = createLimitLogger(fileName + '.log', {
-            logInfo: false
+            logInfo: false,
+            syncLogs: [roomLog]
         });
         result.$error = createLimitLogger(fileName + '.error', {
             logInfo: false,
             error: true,
-            syncLogs: [result.$log]
+            syncLogs: [result.$log, roomError]
         });
     }
     let quite = false
@@ -2078,7 +2089,7 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$log(process.pid, "stdout", "\n" + chunk.toString().trimEnd());
+            console.$log(chunk.toString().trimEnd());
         } else {
             originalStdoutWrite(chunk, ...args); // 保留原始行为
         }
@@ -2089,7 +2100,7 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$error(process.pid, errorStr("stderr"), "\n" + chunk.toString().trimEnd());
+            console.$error(chunk.toString().trimEnd());
         } else {
             originalStderrWrite(chunk, ...args); // 保留原始行为
         }

package/package.json

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