jsir 2.5.3 → 2.5.5

package/deps/room.js

@@ -6,6 +6,7 @@ const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
+const jsirNodesFile = "jsirNodes.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
 const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
 const syncConfigsLockKey = "SyncConfigs_" + getConfigDir();
@@ -134,6 +135,7 @@ async function getTailscaleNodes() {
 
 async function updateRoomInfo() {
     setting.nodeMap = await getTailscaleNodes();
+    await fileJson("jsirNodes.json", obj => setting.nodeMap);
     let nodes = Object.keys(setting.nodeMap)
     let ip = getSelfIP(nodes)
     await fileJson(roomDataFile, async room => {
@@ -180,7 +182,9 @@ async function syncRooms() {
                     }
                 }
                 if (respBody) {
-                    syncRooms.push(JSON.parse(respBody))
+                    let currRoom = JSON.parse(respBody);
+                    currRoom.selfNode = node;
+                    syncRooms.push(currRoom)
                     debug(`sync ${node} success`);
                 }
             } catch (e) {
@@ -275,6 +279,7 @@ async function _syncSetting(room) {
 }
 
 async function initRoom() {
+    setting.nodeMap = await fileJson(jsirNodesFile);
     let roomUpdateTouchTime = false;
     await fileJson(roomDataFile, async room => {
         await initRoomJsir(room)

package/deps/server.js

@@ -7,6 +7,7 @@ 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) {
@@ -35,7 +36,7 @@ function createSign() {
 async function process(routeKey, req, res, params) {
     let router = routes[routeKey]
     if (router) {
-        if ("get /" !== routeKey && !router.isApi) {
+        if ("get /" !== routeKey && !router.isApi && !apiReg.test(routeKey)) {
             // 如果不是api接口，则校验签名
             // 取header里的sign字段
             const sign = req.headers['sign'];
@@ -140,7 +141,7 @@ async function startServer() {
     method, url, fn(req, res, err), null
     err: {code, msg}
  */
-function setRoute(method, url, fn, handler = jsonHandle, isApi) {
+function setRoute(method, url, fn, isApi = false, handler = jsonHandle) {
     startServer();
 
     const routeKey = `${method.toLowerCase()} ${url}`;

package/package.json

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