jsir 3.0.7 → 3.0.9

package/cmd/oaa.js

@@ -1360,7 +1360,7 @@ const keywordDef = {
                         throw 'Not Allowed';
                     }
                     Server.setRoute("post", "/" + setting.configMainFnKey, async (req, res) => {
-                        res.result = await Room.localConfigs();
+                        res.result = await Room.localConfigs(Object.values(_cmdMap));
                     })
                     console.msg("config service online")
                 } else if ("-" === args[0]) {

package/deps/room.js

@@ -3,7 +3,7 @@ const {fileJson, fileLock, vl, getKeyTips, getValTips,
     getRoomsDir, e, isRunningInBackground,
     batchAsync, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
     fileExist, processLock, isPidAlive, cleanFileLocks,
-    roomConsole: console, reget
+    roomConsole: console, reget, md5
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -18,7 +18,25 @@ const tailscalePath = os.platform() === 'darwin' ?
     '/Applications/Tailscale.app/Contents/MacOS/Tailscale':'tailscale';
 const packageJson = require("../package.json");
 
-async function localConfigs() {
+async function localConfigs(uniqueNameList) {
+    if (uniqueNameList && uniqueNameList.length > 0 ) {
+        let configDir = getConfigDir();
+        let configs = {}
+        let fns = uniqueNameList
+            .map(uniqueName => async () => {
+                let fileName = `${md5(uniqueName + (global.$TEST ? '.test':''))}.json`
+                let path = `${configDir}/${fileName}`;
+                if (await fileExist(path)) {
+                    configs[fileName] = String(await fp.readFile(path))
+                }
+            });
+        await batchAsync(fns, 33);
+        return configs;
+    }
+    return await _localAllConfigs();
+}
+
+async function _localAllConfigs() {
     let configDir = getConfigDir();
     let configFiles = await fp.readdir(configDir)
     let fns = configFiles
@@ -112,17 +130,14 @@ async function initNodes() {
         } catch (e) {
             console.$debug("initNodes", e)
         }
-        let isFirst = true
         for (let line of resp.split("\n").map(trim)) {
             let ss = line.split(/\s+/);
             if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
-                let offline = line.indexOf('offline') !== -1 || line.indexOf('active') === -1
                 nodes[ss[0]] = {
                     name: ss[1],
-                    offline: !isFirst && offline,
+                    offline: line.indexOf('offline') !== -1 ,
                     account: ss[2]
                 }
-                isFirst = false
             }
         }
     }
@@ -255,9 +270,11 @@ async function _syncSetting(room) {
         }
         for (const pid of Object.keys(room.jsirs || {})) {
             let jsir = room.jsirs[pid];
-            for (const service of Object.keys(jsir.services || {})) {
+            for (let service of Object.keys(jsir.services || {})) {
                 let serviceFns = jsir.services[service] || [];
-
+                if (service.endsWith("+")) {
+                    service = service.substring(0, service.length - 1)
+                }
                 let existFns = setting.services[service] || [];
                 existFns.push(...serviceFns)
                 setting.services[service] = [...new Set(existFns)]
@@ -356,8 +373,9 @@ async function syncConfigs() {
     let configs;
     try {
         configs = await reqFn(setting.configMainFnKey);
+        console.$msg(`syncConfigs load ${Object.keys(configs)} files`);
     } catch (e) {
-        console.$debug("syncConfigs failed", e)
+        console.$warn("syncConfigs load failed", e)
         return;
     }
     let configDir = getConfigDir();
@@ -370,16 +388,16 @@ async function syncConfigs() {
                 let currText = String(await fp.readFile(path));
                 if (currText !== text) {
                     await fp.writeFile(path, text)
-                    console.$debug(`update config ${key} success`);
+                    console.$msg(`update config ${key} success`);
                 }
             } else {
                 await fp.writeFile(path, text)
-                console.$debug(`create config ${key} success`);
+                console.$msg(`create config ${key} success`);
             }
         });
     }
     await batchAsync(fns, 33)
-    console.$debug('syncConfigs done')
+    console.$msg('syncConfigs done')
 }
 
 async function cleanRoom(room) {
@@ -423,7 +441,12 @@ async function initRoomJsir(room) {
         let ss = key.split("/").map(trim).filter(i => i);
         if (ss.length > 3) {
             // 脚本空间service
-            getOr(services, ss[1] + '/' + ss[2], []).push(ss[3])
+            let route = setting.routes[key]
+            let serviceKey = ss[1] + '/' + ss[2]
+            if (route.isApi) {
+                serviceKey = serviceKey + '+'
+            }
+            getOr(services, serviceKey, []).push(ss[3])
         } else if (ss.length > 2) {
             // jsir service
             getOr(services, ss[1], []).push(ss[2])

package/deps/util.js

@@ -133,7 +133,6 @@ const $log = createLimitLogger(`${setting.name}.log`, {
 });
 const $error = createLimitLogger(`${setting.name}.error`, {
     logInfo: false,
-    error: true,
     syncLogs: [$log]
 });
 // const $errorOnly = createLimitLogger(`${setting.name}.error`, {
@@ -146,7 +145,6 @@ const roomLog = createLimitLogger(`room.log`, {
 });
 const roomError = createLimitLogger(`room.error`, {
     logInfo: false,
-    error: true,
     syncLogs: [roomLog]
 });
 
@@ -342,7 +340,7 @@ function createConsole(uniqueName, _logToFile, _errorToFile) {
                     args = ['', ...args]
                 }
                 let _args = _consoleFns[key].args(args);
-                if ("error" === key) {
+                if ("error" === key || "warn" === key) {
                     errorToFile(..._args)
                 } else {
                     logToFile(..._args)
@@ -819,7 +817,6 @@ function createLimitLogger(fileName, {
     maxChars = 128 * 1024 * 1024,
     logInfo = true,
     time = true,
-    error = false,
     syncLogs = []
 } = {}) {
     fileName = trim(fileName)
@@ -845,9 +842,6 @@ function createLimitLogger(fileName, {
         syncLogs.forEach(i => i(...args));
 
         let text = consoleStrs(...args)
-        if (error) {
-            setting.newError = true;
-        }
         if (time) {
             let prefix = debugStr(`${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%100000).padStart(5, '0')}>`)
             text = `${prefix} ${text}`
@@ -2160,7 +2154,7 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$log(chunk.toString().trimEnd());
+            $log(chunk.toString().trimEnd());
         } else {
             originalStdoutWrite(chunk, ...args); // 保留原始行为
         }
@@ -2171,7 +2165,7 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$error(chunk.toString().trimEnd());
+            $error(chunk.toString().trimEnd());
         } else {
             originalStderrWrite(chunk, ...args); // 保留原始行为
         }

package/package.json

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