Merge pull request #32 from henzeb/socket_interrupted_issue

fixes socket_select interrupted exception
spatie · Oct 3, 2022 · d0232e9 · d0232e9
2 parents 87eb830 + a4fc285
commit d0232e9
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -4,6 +4,7 @@
 
 use Generator;
 use Socket;
+use ErrorException;
 
 class Connection
 {
@@ -55,7 +56,15 @@ public function write(string $payload): self
 
             $except = null;
 
-            $selectResult = socket_select($read, $write, $except, $this->timeoutSeconds, $this->timeoutMicroseconds);
+            try {
+                $selectResult = socket_select($read, $write, $except, $this->timeoutSeconds, $this->timeoutMicroseconds);
+            } catch (ErrorException $e) {
+                if ($this->isInterruptionErrorException()) {
+                    continue;
+                }
+
+                throw $e;
+            }
 
             if ($selectResult === false) {
                 break;
@@ -90,7 +99,15 @@ public function read(): Generator
 
             $except = null;
 
-            $selectResult = socket_select($read, $write, $except, $this->timeoutSeconds, $this->timeoutMicroseconds);
+            try {
+                $selectResult = socket_select($read, $write, $except, $this->timeoutSeconds, $this->timeoutMicroseconds);
+            } catch (ErrorException $e) {
+                if ($this->isInterruptionErrorException()) {
+                    continue;
+                }
+
+                throw $e;
+            }
 
             if ($selectResult === false) {
                 break;
@@ -109,4 +126,9 @@ public function read(): Generator
             yield $outputFromSocket;
         }
     }
+
+    private function isInterruptionErrorException(): bool
+    {
+        return 4 === socket_last_error();
+    }
 }