rexp-web 0.1.1 → 0.1.2

package/README.md

@@ -89,7 +89,7 @@ macOS 使用用户 LaunchAgent，Windows 使用用户启动目录，Linux 桌面
 单个节点的读取错误只在选中该节点时显示简短提示；原始错误可展开“技术详情”，默认收起。
 其他节点的查询和实验完成通知继续工作，安装完成后按正常刷新自动恢复。
 
-Windows 节点状态由 Handfree 自动选择 PowerShell 探测，进程详情使用 CIM；采集不到的 CPU/用户信息显示未知，不用零代替。SSH 已连接但资源探测失败时，不会直接把节点标成离线。新增 SSH 节点由 Handfree 的文件监听加载，插件注册内容每次调用读取；网页下次正常刷新即可显示节点与新安装的 REXP，无需重启 Codex 或 Web。网页节点列表约 45 秒刷新、后端缓存最多 30 秒，因此更新并非每次都瞬间出现在页面上。`web.json` 中 MCP 程序位置和启动参数路径属于启动设置，与节点/插件内容更新不同。
+Windows 节点由 Web 在后台补充 PowerShell 状态探测，进程详情使用 CIM，不需要修改 SSH-MCP 核心，也不要求先安装 REXP。探测共用连接，每个节点最多约 30 秒查询一次，不阻塞服务器列表。采集不到的 CPU/用户信息显示未知，不用零代替。SSH 已连接但资源探测失败时，不会直接把节点标成离线。新增 SSH 节点由 Handfree 的文件监听加载，插件注册内容每次调用读取；网页下次正常刷新即可显示节点与新安装的 REXP，无需重启 Codex 或 Web。网页节点列表约 3 秒刷新、后端列表缓存约 1 秒。`web.json` 中 MCP 程序位置和启动参数路径属于启动设置，与节点/插件内容更新不同。
 
 ## Ray Tune 参数搜索面板
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rexp-web",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "scripts": {
     "start": "node scripts/web.mjs start",

package/server/bridge.mjs

@@ -8,6 +8,7 @@ import { npuQuery, parseNpuSnapshot } from "./accelerators.mjs";
 import { RunMonitor } from "./run-monitor.mjs";
 import { errorInfo } from "./errors.mjs";
 import { createServerDirectory, serverState } from "./server-directory.mjs";
+import { createNodeStatusEnricher } from "./node-status.mjs";
 import {autostartStatus,setAutostart} from './autostart.mjs';
 import {webPaths} from './web-paths.mjs';
 
@@ -40,6 +41,7 @@ const runtimeDir = path.join(os.homedir(), ".cache", "rexp-hub", "ssh-mcp");
 const outputLogDir = path.join(runtimeDir, ".handfree-output");
 let clientPromise;
 const serverDirectory = createServerDirectory({ invoke: (...args) => callTool(...args) });
+const nodeStatus = createNodeStatusEnricher({ invoke: (...args) => callTool(...args) });
 const gpuStreams = new Map();
 const acceleratorFacts = new Map();
 const npuSamples = new Map();
@@ -77,6 +79,7 @@ export async function closeBridge() {
   const pending = clientPromise;
   clientPromise = undefined;
   serverDirectory.clear();
+  nodeStatus.clear();
   acceleratorFacts.clear();
   npuSamples.clear();
   if (pending) {
@@ -114,7 +117,7 @@ async function mcpClient() {
         await client.close().catch(() => {});
         throw new Error(`SSH-MCP 启动失败：${startupError || error.message}`);
       }
-      client.onclose = () => { clientPromise = undefined; serverDirectory.clear(); };
+      client.onclose = () => { clientPromise = undefined; serverDirectory.clear(); nodeStatus.clear(); };
       return client;
     })().catch((error) => { clientPromise = undefined; throw error; });
   }
@@ -308,7 +311,7 @@ export function enrichWindowsProcesses(text, processes) {
 
 async function listServers(force = false) {
   const raw = await serverDirectory.list(force);
-  const items = raw.filter((item) => item.enabled).map((item) => {
+  const items = nodeStatus.enrich(raw.filter((item) => item.enabled)).map((item) => {
     const gpus = item.status?.gpus ?? [];
     const busy = gpus.some((gpu) => (numberOrUndefined(String(gpu.usage).replace("%", "")) ?? 0) >= 20);
     return {

package/server/node-status.mjs

@@ -0,0 +1,61 @@
+// Web-side platform compatibility; SSH-MCP core remains independent of this UI.
+const windowsProbe = `
+$ErrorActionPreference = 'Stop'
+[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+$info = [ordered]@{ reachable = $true; hostname = $env:COMPUTERNAME; osName = 'Windows'; lastUpdated = [DateTime]::UtcNow.ToString('o') }
+try {
+  $os = Get-CimInstance Win32_OperatingSystem
+  $info.osVersion = $os.Caption
+  $info.kernelVersion = $os.Version
+  $info.memory = @{ free = ([math]::Round($os.FreePhysicalMemory/1MB, 1).ToString() + 'G'); total = ([math]::Round($os.TotalVisibleMemorySize/1MB, 1).ToString() + 'G') }
+} catch {}
+try {
+  $cpu = Get-CimInstance Win32_Processor | Select-Object -First 1
+  $info.cpu = @{ name = $cpu.Name }
+  if ($null -ne $cpu.LoadPercentage) { $info.cpu.usage = ($cpu.LoadPercentage.ToString() + '%') }
+} catch {}
+try {
+  if (Get-Command nvidia-smi -ErrorAction SilentlyContinue) {
+    $rows = @(& nvidia-smi --query-gpu=name,utilization.gpu --format=csv,noheader,nounits)
+    if ($LASTEXITCODE -eq 0) {
+      $info.gpus = @($rows | ForEach-Object { $p = $_ -split ','; @{ name = $p[0].Trim(); usage = ($p[1].Trim() + '%') } })
+    }
+  }
+} catch {}
+$info | ConvertTo-Json -Depth 5 -Compress
+`;
+
+export function windowsStatusCommand() {
+  return `powershell.exe -NoProfile -NonInteractive -EncodedCommand ${Buffer.from(windowsProbe, 'utf16le').toString('base64')}`;
+}
+
+export function createNodeStatusEnricher({ invoke, now = Date.now, intervalMs = 30_000 }) {
+  const cache = new Map();
+  const keyFor = item => JSON.stringify([item.name, item.host, item.port, item.username]);
+  return {
+    enrich(items) {
+      const keys = new Set(items.map(keyFor));
+      for (const key of cache.keys()) if (!keys.has(key)) cache.delete(key);
+      return items.map(item => {
+        if (!item.connected || item.status?.osName || item.status?.reachable !== false) return item;
+        const key = keyFor(item);
+        let entry = cache.get(key);
+        if (!entry?.pending && (!entry || now() - entry.checkedAt >= intervalMs)) {
+          entry = { checkedAt: now(), pending: true, status: entry?.status };
+          cache.set(key, entry);
+          const current = entry;
+          Promise.resolve().then(() => invoke('execute-command', {
+            connectionName: item.name, cmdString: windowsStatusCommand(), stream: false, timeout: 10_000,
+          }, 15_000)).then(text => {
+            const status = JSON.parse(text.replace(/^\uFEFF/u, ''));
+            if (status?.osName !== 'Windows' || typeof status.hostname !== 'string') throw new Error('Unrecognized Windows status');
+            if (cache.get(key) === current) current.status = status;
+          }).catch(() => { /* Failed enrichment never marks a connected node offline. */ })
+            .finally(() => { current.pending = false; });
+        }
+        return entry?.status ? { ...item, status: { ...item.status, ...entry.status } } : item;
+      });
+    },
+    clear() { cache.clear(); },
+  };
+}