fix(registry-mock): use sysinfo to kill

Cargo.toml

@@ -57,6 +57,7 @@ sha2               = { version = "0.10.8" }
 split-first-char   = { version = "0.0.0" }
 ssri               = { version = "9.0.0" }
 strum              = { version = "0.25.0", features = ["derive"] }
+sysinfo            = { version = "0.29.10" }
 tar                = { version = "0.4.40" }
 text-block-macros  = { version = "0.1.1" }
 tracing            = { version = "0.1.37" }

crates/registry-mock/Cargo.toml

@@ -20,3 +20,4 @@ serde         = { workspace = true }
 serde_json    = { workspace = true }
 tokio         = { workspace = true }
 which         = { workspace = true }
+sysinfo       = { workspace = true }

crates/registry-mock/src/kill_verdaccio.rs

@@ -0,0 +1,31 @@
+use pipe_trait::Pipe;
+use sysinfo::{
+    Pid, Process, ProcessExt, ProcessRefreshKind, RefreshKind, Signal, System, SystemExt,
+};
+
+pub fn kill_verdaccio_recursive_by_process(process: &Process, signal: Signal) -> u64 {
+    let kill = |process: &Process| -> u64 {
+        if !process.name().to_lowercase().contains("verdaccio") {
+            kill_verdaccio_recursive_by_process(process, signal)
+        } else if process.kill_with(signal).unwrap_or_else(|| process.kill()) {
+            1
+        } else {
+            0
+        }
+    };
+    process.tasks.values().map(kill).sum()
+}
+
+pub fn kill_verdaccio_recursive_by_pid_in(system: &System, pid: Pid, signal: Signal) -> u64 {
+    system
+        .processes()
+        .get(&pid)
+        .map_or(0, |process| kill_verdaccio_recursive_by_process(process, signal))
+}
+
+pub fn kill_verdaccio_recursive_by_pid(pid: Pid, signal: Signal) -> u64 {
+    let system = RefreshKind::new()
+        .with_processes(ProcessRefreshKind::new())
+        .pipe(System::new_with_specifics);
+    kill_verdaccio_recursive_by_pid_in(&system, pid, signal)
+}

crates/registry-mock/src/lib.rs

@@ -1,4 +1,5 @@
 mod dirs;
+mod kill_verdaccio;
 mod mock_instance;
 mod node_registry_mock;
 

crates/registry-mock/src/mock_instance.rs

@@ -1,4 +1,4 @@
-use crate::{node_registry_mock, registry_mock};
+use crate::{kill_verdaccio::kill_verdaccio_recursive_by_pid, node_registry_mock, registry_mock};
 use advisory_lock::{AdvisoryFileLock, FileLockError, FileLockMode};
 use assert_cmd::prelude::*;
 use pipe_trait::Pipe;
@@ -13,6 +13,7 @@ use std::{
     process::{Child, Command, Stdio},
     sync::OnceLock,
 };
+use sysinfo::{Pid, PidExt, Signal};
 use tokio::{
     runtime::Builder,
     time::{sleep, Duration},
@@ -32,33 +33,9 @@ impl Drop for MockInstance {
     fn drop(&mut self) {
         let MockInstance { process, .. } = self;
         let pid = process.id();
-
-        eprintln!("info: Terminating mocked registry with the kill command (kill {pid})...");
-        match Command::new("kill").arg(pid.to_string()).output() {
-            Err(error) => {
-                eprintln!(
-                    "warn: Failed to terminate mocked registry with the kill command: {error}"
-                );
-            }
-            Ok(output) => {
-                if output.status.success() {
-                    eprintln!("info: Mocked registry terminated");
-                    return;
-                }
-
-                let stderr = String::from_utf8_lossy(&output.stderr);
-                eprintln!(
-                    "warn: Failed to terminate mocked registry with the kill command: {stderr}"
-                );
-            }
-        }
-
-        eprintln!("info: Terminating mocked registry with SIGKILL...");
-        if let Err(error) = process.kill() {
-            eprintln!("warn: Failed to terminate mocked registry with SIGKILL: {error}");
-        } else {
-            eprintln!("info: mocked registry terminated");
-        }
+        eprintln!("info: Terminating all verdaccio instances below {pid}...");
+        let kill_count = kill_verdaccio_recursive_by_pid(Pid::from_u32(pid), Signal::Interrupt);
+        eprintln!("info: Terminated {kill_count} verdaccio instances");
     }
 }
 
@@ -237,26 +214,9 @@ impl Drop for RegistryAnchor {
 
         let pid = anchor.info.pid;
         eprintln!("info: There are no more users that use the mocked server");
-        eprintln!("info: Terminating mocked registry with the kill command (kill {pid})...");
-
-        match Command::new("kill").arg(pid.to_string()).output() {
-            Err(error) => {
-                eprintln!(
-                    "warn: Failed to terminate mocked registry with the kill command: {error}"
-                );
-            }
-            Ok(output) => {
-                if output.status.success() {
-                    eprintln!("info: Mocked registry terminated");
-                    return;
-                }
-
-                let stderr = String::from_utf8_lossy(&output.stderr);
-                eprintln!(
-                    "warn: Failed to terminate mocked registry with the kill command: {stderr}"
-                );
-            }
-        }
+        eprintln!("info: Terminating all verdaccio instances below {pid}...");
+        let kill_count = kill_verdaccio_recursive_by_pid(Pid::from_u32(pid), Signal::Interrupt);
+        eprintln!("info: Terminated {kill_count} verdaccio instances");
 
         RegistryAnchor::delete();
         guard.unlock();