jsir 2.5.6 → 2.5.7

package/cmd/oaa.js

@@ -714,7 +714,9 @@ async function dealStar(text) {
     if (_cmdMap.hasOwnProperty(items[0])) {
         rows.push(...await dealStarCmd([], _cmdMap[items[0]], items.slice(1).join(' ')))
     } else if (items[0].indexOf("/") !== -1) {
-        await dealStartGlobalMode(rows, items, text);
+        for (let cmd of filterCmd(items[0])) {
+            dealStarCmd(rows, cmd, items.slice(1).join(" "))
+        }
     } else {
         try {
             let result = await evalText(`return ${items[0]}`)
@@ -739,7 +741,7 @@ function dealStarGlobal(items, text) {
         prefix = trim(items[0].substring(0, index + 1))
         text = trim(text.substring(index + 1))
     }
-    for (let cmd of filterCmd(prefix + '^i ,')) {
+    for (let cmd of filterCmd(prefix + '^i[^a-zA-Z]')) {
         dealStarCmd(rows, cmd, text)
     }
     return rows;

package/deps/room.js

@@ -249,7 +249,7 @@ async function _syncSetting(room) {
     setting.rooms = [setting.selfRoom, ...rooms]
         .map(room => {
             room.active = Date.now() - (room.lastUpdateTime || 0) <= setting.roomHeartbeatExpire;
-            Object.entries(room.jsirs).forEach(([key, jsir]) =>
+            Object.entries(room.jsirs || {}).forEach(([key, jsir]) =>
                 jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= setting.roomHeartbeatExpire)
             return room;
         });

package/deps/server.js

@@ -36,7 +36,7 @@ function createSign() {
 async function process(routeKey, req, res, params) {
     let router = routes[routeKey]
     if (router) {
-        if ("get /" !== routeKey && !router.isApi && !apiReg.test(routeKey)) {
+        if ("get /" !== routeKey && !router.isApi) {
             // 如果不是api接口，则校验签名
             // 取header里的sign字段
             const sign = req.headers['sign'];
@@ -143,7 +143,9 @@ async function startServer() {
  */
 function setRoute(method, url, fn, isApi = false, handler = jsonHandle) {
     startServer();
-
+    if (apiReg.test(url)) {
+        isApi = true;
+    }
     const routeKey = `${method.toLowerCase()} ${url}`;
     if (handler) {
         routes[routeKey] = {

package/deps/util.js

@@ -26,6 +26,7 @@ let tempDir;
 let configDir;
 let roomsDir;
 let dataDir;
+let console = global.console
 
 
 function isRunningInBackground() {
@@ -286,7 +287,7 @@ function createConsole(uniqueName) {
     return result;
 }
 
-const console = createConsole();
+console = createConsole();
 // fix console done
 
 
@@ -1405,9 +1406,13 @@ function cleanFile(path, maxChars = 9 * 1024 * 1024) {
             return;
         }
         await fileLock(path, async () => {
-            let content = String(await fp.readFile(path))
-            let newContext = content.slice(-Math.floor(maxChars * 0.7));
-            await fp.writeFile(path, newContext)
+            const bakFile = `${path}.bak`;
+            // 备份日志
+            try {
+                await fp.rename(path, bakFile);
+            } catch (e) {
+                console.error(`Failed to rename ${path} -> ${bakFile}`, e);
+            }
         }, false)
     }, path)
 }

package/package.json

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