@mcpcn/mcp-computer-env 1.0.2 → 1.0.4

package/dist/index.js

@@ -122,29 +122,77 @@ function getMemoryInfo() {
 function getNetworkInfo() {
     return os.networkInterfaces();
 }
+function normalizeWindowsDiskRow(mountPoint, fileSystem, sizeValue, freeValue) {
+    const drive = mountPoint.trim();
+    const total = Number.parseInt(sizeValue, 10) || 0;
+    const available = Number.parseInt(freeValue, 10) || 0;
+    return {
+        filesystem: drive,
+        mount: drive ? `${drive}\\` : '',
+        type: fileSystem.trim(),
+        total,
+        used: Math.max(total - available, 0),
+        available,
+    };
+}
+async function getDiskInfoWindowsByWmic() {
+    const { stdout } = await execAsync('wmic logicaldisk get Caption,FileSystem,Size,FreeSpace /format:csv');
+    const lines = stdout
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter(Boolean);
+    if (lines.length < 2) {
+        throw new Error('wmic returned empty output');
+    }
+    const header = lines[0].replace(/^\uFEFF/, '').split(',').map((item) => item.trim());
+    const colIndex = {
+        caption: header.indexOf('Caption'),
+        fileSystem: header.indexOf('FileSystem'),
+        size: header.indexOf('Size'),
+        freeSpace: header.indexOf('FreeSpace'),
+    };
+    if (colIndex.caption < 0 || colIndex.fileSystem < 0 || colIndex.size < 0 || colIndex.freeSpace < 0) {
+        throw new Error('wmic returned unexpected columns');
+    }
+    return lines
+        .slice(1)
+        .map((line) => line.split(','))
+        .map((parts) => normalizeWindowsDiskRow(parts[colIndex.caption] || '', parts[colIndex.fileSystem] || '', parts[colIndex.size] || '', parts[colIndex.freeSpace] || ''))
+        .filter((item) => item.filesystem);
+}
+async function getDiskInfoWindowsByPowerShell() {
+    const command = 'powershell -NoProfile -Command "Get-CimInstance Win32_LogicalDisk | Select-Object DeviceID,FileSystem,Size,FreeSpace | ConvertTo-Json -Compress"';
+    const { stdout } = await execAsync(command);
+    const raw = stdout.trim();
+    if (!raw) {
+        throw new Error('PowerShell returned empty output');
+    }
+    const parsed = JSON.parse(raw);
+    const rows = Array.isArray(parsed) ? parsed : [parsed];
+    return rows
+        .filter((row) => Boolean(row) && typeof row === 'object')
+        .map((row) => normalizeWindowsDiskRow(String((row.DeviceID ?? row.Caption ?? '')), String((row.FileSystem ?? '')), String((row.Size ?? '0')), String((row.FreeSpace ?? '0'))))
+        .filter((item) => item.filesystem);
+}
 // 获取磁盘分区信息（跨平台）
 async function getDiskInfo() {
     try {
         const platform = os.platform();
         if (platform === 'win32') {
-            // Windows: 使用wmic
-            const { stdout } = await execAsync('wmic logicaldisk get Caption,FileSystem,Size,FreeSpace');
-            const lines = stdout.trim().split(/\r?\n/).filter(Boolean);
-            const header = lines.shift();
-            return lines.map(line => {
-                const parts = line.trim().split(/\s+/);
-                const [Caption, FileSystem, Size, FreeSpace] = parts;
-                const total = parseInt(Size, 10) || 0;
-                const free = parseInt(FreeSpace, 10) || 0;
-                return {
-                    filesystem: Caption,
-                    mount: Caption + '\\',
-                    type: FileSystem,
-                    total,
-                    used: total - free,
-                    available: free
-                };
-            });
+            // Windows: 先尝试 wmic，失败后回退到 PowerShell
+            try {
+                return await getDiskInfoWindowsByWmic();
+            }
+            catch (wmicError) {
+                try {
+                    return await getDiskInfoWindowsByPowerShell();
+                }
+                catch (powerShellError) {
+                    const wmicMessage = wmicError instanceof Error ? wmicError.message : String(wmicError);
+                    const powerShellMessage = powerShellError instanceof Error ? powerShellError.message : String(powerShellError);
+                    throw new Error(`wmic failed: ${wmicMessage}; PowerShell failed: ${powerShellMessage}`);
+                }
+            }
         }
         else {
             // macOS/Linux: 使用df -kP

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpcn/mcp-computer-env",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "获取用户电脑环境信息的MCP服务器",
   "packageManager": "npm@10.9.0",
   "main": "dist/index.js",