Fix: 'proc_close' blocking issue

cloudtay · Jan 19, 2025 · 67a21f3 · 67a21f3
1 parent ef8c780
commit 67a21f3
Show file tree

Hide file tree

Showing 3 changed files with 163 additions and 139 deletions.
diff --git a/src/Proc/Session.php b/src/Proc/Session.php
@@ -24,6 +24,9 @@
 use function posix_kill;
 use function proc_close;
 use function proc_get_status;
+use function proc_terminate;
+
+use const SIGTERM;
 
 /**
  * @Author cclilshy
@@ -132,9 +135,16 @@ public function close(): void
             }
 
             try {
-                proc_close($this->proc);
+                if (!$this->getStatus('running')) {
+                    proc_close($this->proc);
+                } else {
+                    $this->terminate(SIGTERM);
+                    if (!$this->getStatus('running')) {
+                        proc_close($this->proc);
+                    }
+                }
             } catch (Throwable) {
-                // ignore
+                proc_close($this->proc);
             }
 
             if (isset($this->onClose)) {
@@ -192,16 +202,29 @@ public function inputSignal(int $signalCode): bool
     }
 
     /**
-     * @param string $key
+     * @param string|null $key
      *
      * @return mixed
      */
-    public function getStatus(string $key): mixed
+    public function getStatus(string|null $key = null): mixed
     {
         $status = proc_get_status($this->proc);
         return $key ? ($status[$key] ?? null) : $status;
     }
 
+    /**
+     * @param int|null $signal
+     *
+     * @return bool
+     */
+    public function terminate(int|null $signal = null): bool
+    {
+        if ($signal) {
+            return proc_terminate($this->proc, $signal);
+        }
+        return proc_terminate($this->proc);
+    }
+
     /**
      * @return mixed
      */

diff --git a/src/Worker/Manager.php b/src/Worker/Manager.php
@@ -32,22 +32,22 @@ class Manager
     /**
      * @var Worker[]
      */
-    private array $workers = [];
+    protected array $workers = [];
 
     /**
      * @var Zx7e
      */
-    private Zx7e $zx7e;
+    protected Zx7e $zx7e;
 
     /**
      * @var int
      */
-    private int $index = 1;
+    protected int $index = 1;
 
     /**
      * @var int
      */
-    private int $processID;
+    protected int $processID;
 
     /**
      * @Author cclilshy
@@ -59,7 +59,6 @@ class Manager
      */
     public function addWorker(Worker $worker): void
     {
-        $worker->register($this);
         $workerName = $worker->getName();
         if (isset($this->workers[$workerName])) {
             Output::warning("Worker {$workerName} already exists");
@@ -116,6 +115,14 @@ public function stop(): void
         }
     }
 
+    /**
+     * @return \Ripple\Worker\Worker[]
+     */
+    public function getWorkers(): array
+    {
+        return $this->workers;
+    }
+
     /**
      * @Author cclilshy
      * @Date   2024/8/17 00:13