jsir 2.5.0 → 2.5.2

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) {
@@ -646,7 +645,7 @@ async function _wrapperInput(str) {
                 if (strs[1] === '-') {
                     await offServer(uniqueName)
                 } else {
-                    await joinServer(uniqueName)
+                    await joinServer(uniqueName, strs[1] === '+')
                 }
             } else {
                 console.log(String(fs.readFileSync(path)));
@@ -657,7 +656,7 @@ async function _wrapperInput(str) {
     }
 }
 
-async function joinServer(uniqueName) {
+async function joinServer(uniqueName, isApi) {
     let exportLib = await _requireSource(setting.defaultSpace, uniqueName, true);
     let asyncFnSize = 0
     for (let key of Object.keys(exportLib)) {
@@ -676,12 +675,12 @@ async function joinServer(uniqueName) {
         let val = exportLib[key];
         Server.setRoute('get', `/${pair[0]}/${trimJsirFileName(pair[1])}/${key}`,async (req, res) => {
             res.result = await val(...req);
-        })
+        }, isApi)
         Server.setRoute('post', `/${pair[0]}/${trimJsirFileName(pair[1])}/${key}`,async (req, res) => {
             res.result = await val(...req);
-        })
+        }, isApi)
     }
-    console.msg(uniqueName, 'has become a service.');
+    console.msg(uniqueName, `has become a ${isApi ? "api ":""}service.`);
 }
 
 async function offServer(uniqueName) {
@@ -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: {
@@ -1635,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])
     }
 }
@@ -2135,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];
 }
@@ -2217,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

@@ -54,7 +54,6 @@ async function localConfigs() {
 function onRoom(wrapperInput) {
     if (!setting.roomTid[0]) {
         try {
-            setRoute("post", "/", (req, res) => setting.selfRoom)
             setRoute("get", "/", (req, res) => setting.selfRoom)
             setRoute("post", "/enter", async (req, res) => {
                 if (!getConfig("enableRemote", true)) {
@@ -71,6 +70,7 @@ function onRoom(wrapperInput) {
                     let outputs = setting.enterOutputs || [];
                     setting.enterOutputs = null;
                     res.output = outputs.join('');
+                    global.$newInput = true;
                 }
             })
             if (configMain) {
@@ -113,44 +113,45 @@ function offRoom() {
 function getSelfIP(nodes) {
     let ips = getLocalIPs().ipv4;
     ips = ips.filter(i => nodes.indexOf(i) !== -1);
-    return ips[0]
+    return ips[0] || '127.0.0.1'
 }
 
 async function getTailscaleNodes() {
     let resp = await e(`${tailscalePath} status`);
     let nodes = {}
     for (let line of resp.split("\n").map(trim)) {
-        if (line.indexOf('offline') !== -1) {
-            continue
-        }
+        let offline = line.indexOf('offline') !== -1
         let ss = line.split(/\s+/);
         if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
-            nodes[ss[0]] = ss[1]
+            nodes[ss[0]] = {
+                name: ss[1],
+                offline
+            }
         }
     }
     return nodes;
 }
 
 async function updateRoomInfo() {
-    let nodeMap = await getTailscaleNodes();
-    let nodes = Object.keys(nodeMap)
+    setting.nodeMap = await getTailscaleNodes();
+    let nodes = Object.keys(setting.nodeMap)
     let ip = getSelfIP(nodes)
     await fileJson(roomDataFile, async room => {
+        room = {
+            jsirs: room.jsirs
+        }
         // 设置roomName
-        let name = nodeMap[ip] || os.hostname();
+        let name = setting.nodeMap[ip]?.name || os.hostname();
         if (!vl(room.name) || room.name !== name) {
             room.name = name;
             debug("set roomName", name)
         }
         room.selfNode = ip;
-        room.nodes = nodes;
         room.lastUpdateTime = Date.now()
         debug("init room", room.name)
 
-        // 提前设置一下
-        setting.selfRoom = Object.assign(setting.selfRoom || {}, room);
-
         await cleanRoom(room)
+        return room;
     })
 }
 
@@ -160,10 +161,13 @@ async function syncRooms() {
 
     let syncRooms = []
     let fns = []
-    for (let node of room.nodes) {
+    for (let node of Object.keys(setting.nodeMap)) {
         if (node === room.selfNode) {
             continue
         }
+        if (setting.nodeMap[node]?.offline) {
+            continue
+        }
         fns.push(async () => {
             let respBody = ''
             try {
@@ -195,9 +199,8 @@ async function syncRooms() {
 
     // 清理 roomsDir
     let files = await fp.readdir(roomsDir)
-    let nodes = room.nodes;
     for (let file of files) {
-        if (nodes.indexOf(file) === -1) {
+        if (!setting.nodeMap[file]) {
             try {
                 await fp.unlink(roomsDir + '/' + file)
             } catch (e) {
@@ -218,7 +221,7 @@ async function _syncSetting(room) {
     let roomDir = getRoomsDir();
     let rooms = []
     let files = await fp.readdir(roomDir);
-    for (let node of setting.selfRoom.nodes) {
+    for (let node of Object.keys(setting.nodeMap)) {
         if (setting.selfRoom.selfNode === node) {
             continue
         }
@@ -246,6 +249,9 @@ async function _syncSetting(room) {
     setting.services = {}
     setting.serviceFns = {}
     for (const room of setting.rooms) {
+        if (setting.nodeMap[room.selfNode]?.offline) {
+            continue
+        }
         for (const pid of Object.keys(room.jsirs || {})) {
             let jsir = room.jsirs[pid];
             for (const service of Object.keys(jsir.services || {})) {
@@ -280,7 +286,7 @@ async function initRoom() {
     if (roomUpdateTouchTime) {
         await fileLock(updateRoomInfoLockKey, updateRoomInfo, false)
         fileLock(syncRoomsLockKey, syncRooms, false);
-        if (!configMain && setting.serviceFns.hasOwnProperty(setting.configMainFnKey)) {
+        if (!configMain && setting.serviceFns[setting.configMainFnKey]) {
             fileLock(syncConfigsLockKey, syncConfigs, false);
         }
     }
@@ -381,7 +387,7 @@ async function initRoomJsir(room) {
         busy: await getEventLoopDelay() || (lastJsir ? lastJsir.busy:0),
         back: isRunningInBackground(),
         lastUpdateTime: Date.now(),
-        port: setting.server ? setting.server.address().port:null,
+        port: setting.server ? setting.server.address()?.port:null,
         services: services,
         newError: global.$newError,
         version: packageJson.version,

package/deps/server.js

@@ -7,7 +7,6 @@ const preferredPort = setting.defaultPort;
 // 路由存储
 const routes = setting.routes;
 let invokeStart = false;
-const apiReg = /[^a-zA-Z]api[^a-zA-Z]|[^a-zA-Z]api$/i;
 
 function debug(...args) {
     if (global.$DEBUG) {
@@ -17,7 +16,7 @@ function debug(...args) {
 
 function verifySign(sign) {
     try {
-        let key = md5([...setting.selfRoom.nodes].sort().join(":")).substring(0, 16);
+        let key = md5(Object.keys(setting.nodeMap).sort().join(":")).substring(0, 16);
         return parseInt(aesDecipher(sign, key), 10);  // 假设sign是base64编码的毫秒数
     } catch (e) {
         return null;  // 解码失败返回null
@@ -26,16 +25,23 @@ function verifySign(sign) {
 
 function createSign() {
     try {
-        let key = md5([...setting.selfRoom.nodes].sort().join(":")).substring(0, 16);
+        let key = md5(Object.keys(setting.nodeMap).sort().join(":")).substring(0, 16);
         return aesCipher(String(Date.now()), key)
     } catch (e) {
         return null;  // 解码失败返回null
     }
 }
 
-async function process(routeKey, req, res, params) {
-    if (routes[routeKey]) {
-        if (!apiReg.test(routeKey)) {
+async function process(routeKey, req, res, params, clientIp) {
+    if (!clientIp.endsWith(":" + setting.selfRoom.selfNode)) {
+        res.writeHead(403, {'Content-Type': 'text/plain'});
+        res.end('Forbidden: Not Allowed');
+        return;
+    }
+
+    let router = routes[routeKey]
+    if (router) {
+        if ("get /" !== routeKey && !router.isApi) {
             // 如果不是api接口，则校验签名
             // 取header里的sign字段
             const sign = req.headers['sign'];
@@ -70,7 +76,7 @@ async function process(routeKey, req, res, params) {
                     resolve()
                 })
             })
-            await routes[routeKey](body || params, res);
+            await router.fn(body || params, res);
         } catch (e) {
             res.writeHead(500, {'Content-Type': 'text/plain'});
             res.end(String(isError(e) ? e.message : e));
@@ -101,7 +107,7 @@ async function createServer(port) {
         const routeKey = `${method} ${url}`;
         let time = Date.now();
         try {
-            await process(routeKey, req, res, params);
+            await process(routeKey, req, res, params, clientIp);
         } finally {
             debug(`Process cost ${Date.now() - time}ms for ${routeKey} from ${clientIp}`);
         }
@@ -140,16 +146,22 @@ async function startServer() {
     method, url, fn(req, res, err), null
     err: {code, msg}
  */
-function setRoute(method, url, fn, handler = jsonHandle) {
+function setRoute(method, url, fn, handler = jsonHandle, isApi) {
     startServer();
 
     const routeKey = `${method.toLowerCase()} ${url}`;
     if (handler) {
-        routes[routeKey] = async (req, res) => {
-            await handler(req, res, fn)
+        routes[routeKey] = {
+            fn: async (req, res) => {
+                await handler(req, res, fn)
+            },
+            isApi
         };
     } else {
-        routes[routeKey] = fn;
+        routes[routeKey] = {
+            fn,
+            isApi
+        };
     }
     debug(`setRoute: ${method.toUpperCase()} ${url} ${handler ? handler.name:''}`);
     return setting.server;

package/deps/setting.js

@@ -22,6 +22,7 @@ module.exports = {
     workspaceMap: {},
     enableNextLine: true,
     roomTid: [],
+    nodeMap: {},
     selfRoom: {},
     rooms: [],
     server: null,

package/deps/util.js

@@ -935,21 +935,25 @@ function validStr(str, name) {
     }
 }
 
-function aesCipher(str, key){
+function aesCipher(str, key, useIv = false){
     validStr(str, "str");
     validStr(key, "key");
 
     key = trim(key);
     if (!key || key.length > 16) {
-        throw "aesCipher key length should between 1 and 16"
+        throw "aesCipher key length should be between 1 and 16"
     }
-    try {
-        const cipher = crypto.createCipheriv('aes-128-ecb', pad(key, 16, '0'), null);
-        return cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
-    } catch(err) {
-        $log(err)
-        throw 'aesCipher failed: ' + String(err)
+    if (useIv) {
+        // Generate random IV
+        const iv = crypto.randomBytes(16);
+        const cipher = crypto.createCipheriv('aes-128-cbc', pad(key, 16, '0'), iv);
+
+        // Return IV and ciphertext, as IV is needed for decryption
+        const ciphertext = cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
+        return iv.toString('hex') + ':' + ciphertext; // Combine IV and ciphertext
     }
+    const cipher = crypto.createCipheriv('aes-128-ecb', pad(key, 16, '0'), null);
+    return cipher.update(str, 'utf8', 'hex') + cipher.final('hex');
 }
 
 function aesDecipher(str, key){
@@ -958,15 +962,21 @@ function aesDecipher(str, key){
 
     key = trim(key);
     if (!key || key.length > 16) {
-        throw "aesCipher key length should between 1 and 16"
+        throw "aesCipher key length should be between 1 and 16";
     }
-    try {
-        const decipher = crypto.createDecipheriv('aes-128-ecb', pad(key, 16, '0'), null);
-        return decipher.update(str, 'hex', 'utf8') + decipher.final('utf8');
-    } catch(err) {
-        $log(err)
-        throw 'aesDecipher failed: ' + String(err)
+
+    // Extract IV and ciphertext
+    if(str.indexOf(":") !== -1) {
+        const [ivHex, ciphertext] = str.split(':');
+        if (!ivHex || !ciphertext) {
+            throw "Invalid encrypted string format";
+        }
+        const iv = Buffer.from(ivHex, 'hex');
+        const decipher = crypto.createDecipheriv('aes-128-cbc', pad(key, 16, '0'), iv);
+        return decipher.update(ciphertext, 'hex', 'utf8') + decipher.final('utf8');
     }
+    const decipher = crypto.createDecipheriv('aes-128-ecb', pad(key, 16, '0'), null);
+    return decipher.update(str, 'hex', 'utf8') + decipher.final('utf8');
 }
 
 function getConfig(key, defaultVal) {
@@ -2089,7 +2099,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); // 保留原始行为
         }
@@ -2100,7 +2110,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.5.0",
+  "version": "2.5.2",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {