dependency-change-report 1.0.1 → 1.0.3

package/lib/index.mjs

@@ -31,48 +31,77 @@ const executeCommand = (command, args, cwd, timeout = 300000) => {
     let stdout = '';
     let stderr = '';
     let isResolved = false;
+    let timeoutId = null;
 
-    // Set up timeout with proper cleanup
-    const timeoutId = setTimeout(() => {
-      if (!isResolved) {
-        isResolved = true;
+    // Cleanup function to remove all listeners and clear timeout
+    const cleanup = () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+        timeoutId = null;
+      }
+      
+      // Remove all listeners to prevent memory leaks and hanging
+      childProcess.removeAllListeners();
+      
+      // Ensure streams are properly closed
+      if (childProcess.stdout) {
+        childProcess.stdout.removeAllListeners();
+      }
+      if (childProcess.stderr) {
+        childProcess.stderr.removeAllListeners();
+      }
+    };
+
+    // Kill process function
+    const killProcess = () => {
+      try {
+        // Just kill the process directly, don't try process group
+        childProcess.kill('SIGTERM');
         
-        // Kill the process and all its children
-        try {
-          if (childProcess.pid) {
-            // Try to kill the process group first
-            process.kill(-childProcess.pid, 'SIGTERM');
-          }
-        } catch (e) {
-          // If that fails, kill just the process
+        // If SIGTERM doesn't work after a short delay, use SIGKILL
+        setTimeout(() => {
           try {
-            childProcess.kill('SIGTERM');
-          } catch (e2) {
-            // Force kill if SIGTERM doesn't work
-            try {
+            if (!childProcess.killed) {
               childProcess.kill('SIGKILL');
-            } catch (e3) {
-              // Process might already be dead
             }
+          } catch (e) {
+            // Process might already be dead
           }
-        }
-        
+        }, 1000);
+      } catch (e) {
+        // Process might already be dead
+      }
+    };
+
+    // Set up timeout with proper cleanup
+    timeoutId = setTimeout(() => {
+      if (!isResolved) {
+        isResolved = true;
+        killProcess();
+        cleanup();
         reject(new Error(`Command timed out after ${timeout}ms: ${command} ${args.join(' ')}`));
       }
     }, timeout);
 
-    childProcess.stdout.on('data', (data) => {
-      stdout += data.toString();
-    });
+    // Handle stdout data
+    if (childProcess.stdout) {
+      childProcess.stdout.on('data', (data) => {
+        stdout += data.toString();
+      });
+    }
 
-    childProcess.stderr.on('data', (data) => {
-      stderr += data.toString();
-    });
+    // Handle stderr data
+    if (childProcess.stderr) {
+      childProcess.stderr.on('data', (data) => {
+        stderr += data.toString();
+      });
+    }
 
+    // Handle process close (preferred over exit)
     childProcess.on('close', (code, signal) => {
       if (!isResolved) {
         isResolved = true;
-        clearTimeout(timeoutId);
+        cleanup();
         
         if (signal) {
           reject(new Error(`Command was killed with signal ${signal}: ${command} ${args.join(' ')}`));
@@ -86,29 +115,14 @@ const executeCommand = (command, args, cwd, timeout = 300000) => {
       }
     });
 
+    // Handle process errors
     childProcess.on('error', (error) => {
       if (!isResolved) {
         isResolved = true;
-        clearTimeout(timeoutId);
+        cleanup();
         reject(error);
       }
     });
-
-    // Handle process exit to ensure cleanup
-    childProcess.on('exit', (code, signal) => {
-      if (!isResolved) {
-        isResolved = true;
-        clearTimeout(timeoutId);
-        
-        if (signal) {
-          reject(new Error(`Command exited with signal ${signal}: ${command} ${args.join(' ')}`));
-        } else if (code !== 0) {
-          reject(new Error(`Command exited with code ${code}: ${command} ${args.join(' ')}`));
-        } else {
-          resolve(stdout);
-        }
-      }
-    });
   });
 };
 
@@ -1395,30 +1409,9 @@ const analyzeDependencyChanges = async (repoUrl, olderVersion, newerVersion, wor
     report.reportPath = reportPath;
     
     console.log(`Report generated at ${reportPath}`);
-    
-    // Force cleanup of any remaining processes
-    if (process.platform !== 'win32') {
-      try {
-        // Kill any remaining git processes that might be hanging
-        await executeCommand('pkill', ['-f', 'git'], undefined, 5000);
-      } catch (e) {
-        // Ignore errors - processes might not exist
-      }
-    }
-    
     return report;
   } catch (error) {
     console.error(`Error analyzing dependency changes: ${error.message}`);
-    
-    // Force cleanup on error as well
-    if (process.platform !== 'win32') {
-      try {
-        await executeCommand('pkill', ['-f', 'git'], undefined, 5000);
-      } catch (e) {
-        // Ignore errors
-      }
-    }
-    
     throw error;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-change-report",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "index.mjs",
   "type": "module",
   "bin": {