jsir 2.4.8 → 2.5.0

package/cmd/oaa.js

@@ -1470,13 +1470,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;
                 }

package/deps/room.js

@@ -118,19 +118,26 @@ function getSelfIP(nodes) {
 
 async function getTailscaleNodes() {
     let resp = await e(`${tailscalePath} status`);
-    let nodes = []
-    regEach(resp, /^(\d+\.\d+\.\d+\.\d+)\s+/mg, arr => {
-        nodes.push(arr[1])
-    });
-    return [...new Set(nodes)];
+    let nodes = {}
+    for (let line of resp.split("\n").map(trim)) {
+        if (line.indexOf('offline') !== -1) {
+            continue
+        }
+        let ss = line.split(/\s+/);
+        if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
+            nodes[ss[0]] = ss[1]
+        }
+    }
+    return nodes;
 }
 
 async function updateRoomInfo() {
-    let nodes = await getTailscaleNodes();
+    let nodeMap = await getTailscaleNodes();
+    let nodes = Object.keys(nodeMap)
     let ip = getSelfIP(nodes)
     await fileJson(roomDataFile, async room => {
         // 设置roomName
-        let name = os.hostname();
+        let name = nodeMap[ip] || os.hostname();
         if (!vl(room.name) || room.name !== name) {
             room.name = name;
             debug("set roomName", name)
@@ -239,9 +246,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] || [];
@@ -358,6 +365,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] = {
@@ -483,7 +494,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

package/package.json

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