jsir 3.0.9 → 3.1.2

package/deps/room.js

@@ -17,6 +17,8 @@ const http = require('http');
 const tailscalePath = os.platform() === 'darwin' ?
     '/Applications/Tailscale.app/Contents/MacOS/Tailscale':'tailscale';
 const packageJson = require("../package.json");
+const { performance } = require('perf_hooks');
+let elu0 = performance.eventLoopUtilization()
 
 async function localConfigs(uniqueNameList) {
     if (uniqueNameList && uniqueNameList.length > 0 ) {
@@ -373,7 +375,7 @@ async function syncConfigs() {
     let configs;
     try {
         configs = await reqFn(setting.configMainFnKey);
-        console.$msg(`syncConfigs load ${Object.keys(configs)} files`);
+        console.$msg(`syncConfigs load ${Object.keys(configs).length} files`);
     } catch (e) {
         console.$warn("syncConfigs load failed", e)
         return;
@@ -417,17 +419,14 @@ async function cleanRoom(room) {
 }
 
 /*
-最小为0
-100 为1 毫秒
+< 0.3 很空
+0.3 ~ 0.6 正常
+0.6 ~ 0.8 明显忙
  */
 async function getEventLoopDelay() {
-    const start = process.hrtime.bigint();
-    const delay = 1; // 用于测量的短暂延迟（单位：毫秒）
-    const timeoutPromise = new Promise(resolve => setTimeout(resolve, delay));
-    return await timeoutPromise.then(() => {
-        const end = process.hrtime.bigint();
-        return Number(Math.max(Number(end - start) / 1e4 - (delay * 1e2), 0).toFixed(0)); // 避免负值
-    });
+    const cur = performance.eventLoopUtilization(elu0); // 计算这段时间的差分
+    elu0 = performance.eventLoopUtilization();          // 更新基准点（关键！）
+    return Number(cur.utilization.toFixed(1));
 }
 
 async function initRoomJsir(room) {
@@ -457,7 +456,6 @@ async function initRoomJsir(room) {
         services[key] = [...new Set(services[key])]
     }
     // 初始化jsir
-    let lastJsir = room.jsirs[process.pid]
     setting.selfJsir = {
         pid: process.pid,
         space: setting.defaultSpace,
@@ -465,7 +463,7 @@ async function initRoomJsir(room) {
             obj[key] = getValTips()[index];
             return obj;
         }, {}),
-        busy: await getEventLoopDelay() || (lastJsir ? lastJsir.busy:0),
+        busy: await getEventLoopDelay(),
         back: isRunningInBackground(),
         lastUpdateTime: setting.roomTime,
         port: setting.server ? setting.server.address()?.port:null,
@@ -589,21 +587,27 @@ async function reqNode(node, method, url, port, body) {
 }
 
 function busyPick(busyItems) {
-    if (busyItems.length === 1) {
-        return busyItems[0]
+    if (busyItems.length === 1) return busyItems[0];
+
+    const weights = busyItems.map(item => {
+        // ELU 本来就是 0~1，这里只是兜底
+        const busy = Math.min(Math.max(item.busy ?? 1, 0), 1);
+        return 1 - busy; // 越忙权重越小
+    });
+
+    const total = weights.reduce((a, b) => a + b, 0);
+    if (total <= 0) {
+        // 所有节点都接近 1（极忙）时，随机选一个
+        return busyItems[Math.floor(Math.random() * busyItems.length)];
     }
-    // 反转权重：计算 1 / busy 值作为权重
-    const weights = busyItems.map(item => 1 / (item.busy || 1));
-    const totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
-    const random = Math.random() * totalWeight;
 
-    let cumulativeWeight = 0;
+    let r = Math.random() * total;
     for (let i = 0; i < busyItems.length; i++) {
-        cumulativeWeight += weights[i];
-        if (random < cumulativeWeight) {
-            return busyItems[i]; // 选中反转权重命中的对象
-        }
+        r -= weights[i];
+        if (r <= 0) return busyItems[i];
     }
+
+    return busyItems[busyItems.length - 1]; // 兜底
 }
 
 function isMatchTarget(target, node, port) {

package/deps/util.js

@@ -1608,27 +1608,39 @@ function ei(cmd, args = [], shell = false) {
     spawnSync(cmd, args, {stdio:"inherit", shell});
 }
 
-async function eia(cmd, args = [], shell = false) {
-    `
-    当前进程不会卡住，输入输出由cmd进程持有
+async function eia(cmd, args = [], shell = false, input = null) {
     `
+  当前进程不会卡住（事件循环仍在），但会 await 等子进程退出；
+  输入输出默认由 cmd 进程持有；如果传 input，则把 input 写入 stdin。
+  `
     if (isRunningInBackground()) {
         throw 'Unsupported Operation';
     }
     setting.enableNextLine = false;
-    let child = spawn(cmd, args, {stdio:"inherit", shell});
+
+    // 如果需要写入 input，则 stdin 必须是 pipe
+    const stdio = input != null
+        ? ['pipe', 'inherit', 'inherit']
+        : 'inherit';
+
+    const child = spawn(cmd, args, { stdio, shell });
+
+    // 把内存内容喂给子进程
+    if (input != null) {
+        child.stdin.write(input);
+        child.stdin.end();
+    }
+
     return new Promise((resolve, reject) => {
-        // 监听子进程的关闭事件
         child.on('close', (code) => {
             setting.enableNextLine = true;
             resolve(code);
         });
-        // 可选：监听子进程的错误事件
         child.on('error', (err) => {
             setting.enableNextLine = true;
-            reject(err)
+            reject(err);
         });
-    })
+    });
 }
 
 async function getCbText(mbNum) {

package/package.json

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