@daimazun/hardware-info 1.0.0 → 1.0.1

package/lib/process-ops.js

@@ -94,7 +94,7 @@ function findPidsByName(name) {
  *   - { pid: number|number[] }: 按 PID 杀
  *   - { port: number|number[], protocol?: 'tcp'|'udp'|'all' }: 按端口杀
  *   - { name: string|string[] }: 按进程名杀
- * @returns {Promise<{ok: boolean, killed: number, failed: number, pids?: number[], message?: string}>}
+ * @returns {Promise<{ok: boolean, killed: number, failed: number, pids?: number[], failedDetails?: Array<{pid: number|null, reason: string}>, message?: string}>}
  */
 async function killProcess(input) {
   let pids = [];
@@ -160,6 +160,7 @@ async function killProcess(input) {
   const fkill = await getFkill();
   let killed = 0;
   let failed = 0;
+  const failedDetails = [];
 
   try {
     // fkill 支持一次传 PID 数组，内部并行处理
@@ -169,27 +170,38 @@ async function killProcess(input) {
     // fkill 失败时抛 AggregateError，errors 数组包含每个 PID 的具体错误
     if (e.name === 'AggregateError' && Array.isArray(e.errors)) {
       for (const err of e.errors) {
-        const msg = String(err).toLowerCase();
+        const msg = String(err);
+        const lowerMsg = msg.toLowerCase();
+        // 从错误消息里提取 PID：格式如 "Killing process 1234 failed: 拒绝访问"
+        const pidMatch = msg.match(/Killing process\s+(\d+)\s+failed:\s*(.+)/i);
+        const pid = pidMatch ? parseInt(pidMatch[1], 10) : null;
+        const reason = pidMatch ? pidMatch[2].trim() : msg;
         // 进程已不存在，视为达成目标
-        if (msg.includes("doesn't exist") || msg.includes('not found') || msg.includes('不存在')) {
+        if (lowerMsg.includes("doesn't exist") || lowerMsg.includes('not found') || lowerMsg.includes('不存在')) {
           killed++;
         } else {
           failed++;
+          failedDetails.push({ pid, reason });
         }
       }
     } else {
+      // 非 AggregateError（如 fkill 加载失败、taskkill 不存在等）：全部标记失败
       failed = list.length;
+      for (const pid of list) {
+        failedDetails.push({ pid, reason: e.message || String(e) });
+      }
     }
   }
 
   if (killed > 0) {
-    return { ok: true, killed, failed, pids: list };
+    return { ok: true, killed, failed, pids: list, failedDetails };
   }
   return {
     ok: false,
     killed: 0,
     failed,
     pids: list,
+    failedDetails,
     message: '结束失败：权限不足或进程受系统保护，请以管理员身份运行'
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daimazun/hardware-info",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Cross-platform hardware information & monitor library — CPU temperature/load/clock/power, memory, disk, motherboard, GPU via OpenHardwareMonitor (Windows) with Linux/macOS support planned",
   "type": "commonjs",
   "main": "index.js",