@mcpcn/mcp-computer-env 1.0.1 → 1.0.4

package/dist/index.js

@@ -29,7 +29,9 @@ function getSystemInfo() {
             if (match)
                 distro = match[1];
         }
-        catch { }
+        catch (error) {
+            // 忽略文件读取错误，distro 保持为空字符串
+        }
     }
     return {
         platform,
@@ -89,18 +91,23 @@ function getCommonDirs() {
         dirs.pictures = path.join(home, '图片');
         dirs.videos = path.join(home, '视频');
         // 兼容英文目录
-        if (!fs.existsSync(dirs.desktop))
-            dirs.desktop = path.join(home, 'Desktop');
-        if (!fs.existsSync(dirs.documents))
-            dirs.documents = path.join(home, 'Documents');
-        if (!fs.existsSync(dirs.downloads))
-            dirs.downloads = path.join(home, 'Downloads');
-        if (!fs.existsSync(dirs.music))
-            dirs.music = path.join(home, 'Music');
-        if (!fs.existsSync(dirs.pictures))
-            dirs.pictures = path.join(home, 'Pictures');
-        if (!fs.existsSync(dirs.videos))
-            dirs.videos = path.join(home, 'Videos');
+        try {
+            if (!fs.existsSync(dirs.desktop))
+                dirs.desktop = path.join(home, 'Desktop');
+            if (!fs.existsSync(dirs.documents))
+                dirs.documents = path.join(home, 'Documents');
+            if (!fs.existsSync(dirs.downloads))
+                dirs.downloads = path.join(home, 'Downloads');
+            if (!fs.existsSync(dirs.music))
+                dirs.music = path.join(home, 'Music');
+            if (!fs.existsSync(dirs.pictures))
+                dirs.pictures = path.join(home, 'Pictures');
+            if (!fs.existsSync(dirs.videos))
+                dirs.videos = path.join(home, 'Videos');
+        }
+        catch (error) {
+            // 忽略文件系统检查错误，使用默认值
+        }
         dirs.appData = process.env.XDG_CONFIG_HOME || path.join(home, '.config');
     }
     return dirs;
@@ -115,48 +122,102 @@ 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() {
-    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
-            };
-        });
+    try {
+        const platform = os.platform();
+        if (platform === 'win32') {
+            // 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
+            const { stdout } = await execAsync('df -kP');
+            const lines = stdout.trim().split(/\n/).filter(Boolean);
+            lines.shift(); // 去掉表头
+            return lines.map(line => {
+                const parts = line.replace(/\s+/g, ' ').split(' ');
+                // Filesystem 1024-blocks Used Available Capacity Mounted on
+                const [filesystem, blocks, used, available, capacity, ...mountArr] = parts;
+                const mount = mountArr.join(' ');
+                return {
+                    filesystem,
+                    mount,
+                    type: '', // 跨平台简化，详细类型可用mount命令补充
+                    total: parseInt(blocks, 10) * 1024,
+                    used: parseInt(used, 10) * 1024,
+                    available: parseInt(available, 10) * 1024
+                };
+            });
+        }
     }
-    else {
-        // macOS/Linux: 使用df -kP
-        const { stdout } = await execAsync('df -kP');
-        const lines = stdout.trim().split(/\n/).filter(Boolean);
-        lines.shift(); // 去掉表头
-        return lines.map(line => {
-            const parts = line.replace(/\s+/g, ' ').split(' ');
-            // Filesystem 1024-blocks Used Available Capacity Mounted on
-            const [filesystem, blocks, used, available, capacity, ...mountArr] = parts;
-            const mount = mountArr.join(' ');
-            return {
-                filesystem,
-                mount,
-                type: '', // 跨平台简化，详细类型可用mount命令补充
-                total: parseInt(blocks, 10) * 1024,
-                used: parseInt(used, 10) * 1024,
-                available: parseInt(available, 10) * 1024
-            };
-        });
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new McpError(ErrorCode.InternalError, `Failed to get disk info: ${errorMessage}`);
     }
 }
 class ComputerEnvServer {
@@ -207,31 +268,57 @@ class ComputerEnvServer {
             ],
         }));
         this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+            const { name, arguments: args } = request.params;
             try {
-                switch (request.params.name) {
+                switch (name) {
                     case 'get_system_info':
-                        return { content: [{ type: 'text', text: JSON.stringify(getSystemInfo()) }] };
+                        return {
+                            content: [{ type: 'text', text: JSON.stringify(getSystemInfo()) }],
+                            isError: false
+                        };
                     case 'get_common_dirs':
-                        return { content: [{ type: 'text', text: JSON.stringify(getCommonDirs()) }] };
+                        return {
+                            content: [{ type: 'text', text: JSON.stringify(getCommonDirs()) }],
+                            isError: false
+                        };
                     case 'get_memory_info':
-                        return { content: [{ type: 'text', text: JSON.stringify(getMemoryInfo()) }] };
+                        return {
+                            content: [{ type: 'text', text: JSON.stringify(getMemoryInfo()) }],
+                            isError: false
+                        };
                     case 'get_network_info':
-                        return { content: [{ type: 'text', text: JSON.stringify(getNetworkInfo()) }] };
+                        return {
+                            content: [{ type: 'text', text: JSON.stringify(getNetworkInfo()) }],
+                            isError: false
+                        };
                     case 'get_disk_info':
-                        return { content: [{ type: 'text', text: JSON.stringify(await getDiskInfo()) }] };
+                        return {
+                            content: [{ type: 'text', text: JSON.stringify(await getDiskInfo()) }],
+                            isError: false
+                        };
                     default:
-                        throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${request.params.name}`);
+                        throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${name}`);
                 }
             }
             catch (error) {
-                throw error;
+                if (error instanceof McpError) {
+                    throw error;
+                }
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                throw new McpError(ErrorCode.InternalError, `Error executing tool ${name}: ${errorMessage}`);
             }
         });
     }
     async run() {
-        const transport = new StdioServerTransport();
-        await this.server.connect(transport);
-        console.error('Computer Env MCP server running on stdio');
+        try {
+            const transport = new StdioServerTransport();
+            await this.server.connect(transport);
+            console.error('Computer Env MCP server running on stdio');
+        }
+        catch (error) {
+            console.error('Failed to start server:', error);
+            process.exit(1);
+        }
     }
 }
 const server = new ComputerEnvServer();

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@mcpcn/mcp-computer-env",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "获取用户电脑环境信息的MCP服务器",
-  "packageManager": "pnpm@8.12.1",
+  "packageManager": "npm@10.9.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -26,7 +26,7 @@
     "start": "node dist/index.js",
     "dev": "tsc -w",
     "clean": "rm -rf build",
-    "prepare": "pnpm clean && pnpm build"
+    "prepare": "npm run clean && npm run build"
   },
   "type": "module",
   "license": "MIT",