jsir 3.0.1 → 3.0.3

package/cmd/oaa.js

@@ -2364,17 +2364,23 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
         } else {
             if (setting.serviceReg.test(uniqueName)) {
                 let serviceKey = `${pair[0]}/${trimJsirFileName(pair[1])}`
-                if (setting.services[serviceKey]) {
-                    let serviceObj = {};
-                    for (let fn of setting.services[serviceKey]) {
-                        serviceObj[fn] = async (...args) => {
-                            return await Room.reqFn(`${serviceKey}/${fn}`, args);
+                return new Proxy({}, {
+                    get(target, prop) {
+                        if (prop === 'then') {
+                            return undefined;
+                        }
+                        let fns = setting.services[serviceKey]
+                        if (!fns) {
+                            throw `invoke ${prop} failed cause service ${serviceKey} not found`;
+                        }
+                        if (!fns.includes(prop)) {
+                            throw `service function ${serviceKey}/${prop} not found`;
+                        }
+                        return async (...args) => {
+                            return await Room.reqFn(`${serviceKey}/${prop}`, args);
                         }
                     }
-                    return serviceObj
-                } else {
-                    throw `service ${serviceKey} not found`;
-                }
+                })
             } else {
                 result = await evalText(text, uniqueName)
             }

package/deps/room.js

@@ -368,11 +368,11 @@ async function syncConfigs() {
                 let currText = String(await fp.readFile(path));
                 if (currText !== text) {
                     await fp.writeFile(path, text)
-                    console.$debug(`sync ${key} success`);
+                    console.$debug(`update config ${key} success`);
                 }
             } else {
                 await fp.writeFile(path, text)
-                console.$debug(`sync ${key} success`);
+                console.$debug(`create config ${key} success`);
             }
         });
     }
@@ -535,10 +535,12 @@ async function reqNode(node, method, url, port, body) {
             });
 
             // 设置超时逻辑
-            if (setting.reqNodeTimeouts[url]) {
+            let timeoutMs = setting.reqNodeTimeouts[url];
+            if (timeoutMs) {
                 timeout = setTimeout(() => {
                     req.destroy(); // 中断请求
-                }, setting.reqNodeTimeouts[url]); // 10秒超时
+                    reject(new Error(`Timeout ${timeoutMs}ms`))
+                }, timeoutMs); // 10秒超时
             }
 
             // 错误处理
@@ -580,7 +582,10 @@ function busyPick(busyItems) {
 }
 
 async function reqFn(fnKey, args = []) {
-    let targets = setting.serviceFns[fnKey] || []
+    let targets = setting.serviceFns[fnKey]
+    if (!targets) {
+        throw `service function ${fnKey} instance not found`;
+    }
     targets = targets
         .filter(i => i.active)
         .filter(i => !isDisableConnect(i.node, i.port));
@@ -588,7 +593,7 @@ async function reqFn(fnKey, args = []) {
     if (targets.length > 0) {
         target = busyPick(targets);
     } else {
-        throw `service function ${fnKey} not found`;
+        throw `service function ${fnKey} instance not enable`;
     }
     let resp = await reqNode(target.node, 'post',
         `/${fnKey}`, target.port, JSON.stringify(args || []))

package/deps/util.js

@@ -6,7 +6,7 @@ const fs = require('fs')
 const fp = require('fs').promises
 const BigNumber = require('bignumber.js');
 const crypto = require('crypto');
-const dayJs = require('dayjs')
+const dayjs = require('dayjs')
 const table = require('console.table')
 const initModulePaths = Object.assign([], module.paths)
 const path = require('path')
@@ -678,7 +678,7 @@ function getFileOpenExe() {
 }
 
 function timeStr(fmt, date) {
-    return dayJs(date || new Date()).format(fmt || 'YYYY-MM-DD HH:mm:ss')
+    return dayjs(date || new Date()).format(fmt || 'YYYY-MM-DD HH:mm:ss')
 }
 
 function vl(obj) {
@@ -844,7 +844,8 @@ function createLimitLogger(fileName, {
             setting.newError = true;
         }
         if (time) {
-            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%1000).padStart(3, '0')}> ${text}`
+            let prefix = debugStr(`${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${String(process.pid%1000).padStart(3, '0')}>`)
+            text = `${prefix} ${text}`
         }
         fp.appendFile(logPath, text + '\n')
         let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
@@ -2279,7 +2280,7 @@ module.exports = {
     removeFirst,
     sleep,
     timeLimit,
-    dayJs,
+    dayjs,
     setCbText,
     randomInt,
     vl,

package/package.json

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