Refactor I/O exceptions

composer.json

@@ -6,7 +6,7 @@
   "description" : "Networking for the XP Framework: Client and server APIs",
   "keywords": ["module", "xp"],
   "require" : {
-    "xp-framework/core": "^12.0 | ^11.0 | ^10.0",
+    "xp-framework/core": "^12.11 | ^11.11",
     "xp-framework/logging": "^11.0 | ^10.0",
     "php" : ">=7.4.0"
   },

src/main/php/peer/SocketException.class.php

@@ -1,8 +1,8 @@
 <?php namespace peer;
 
-/**
- * Indicate a generic I/O error on a socket
- */
-class SocketException extends \io\IOException {
+use io\OperationFailed;
+
+/** Indicate a generic I/O error on a socket */
+class SocketException extends OperationFailed {
 
 }

src/main/php/peer/server/ForkingServer.class.php

@@ -1,5 +1,6 @@
 <?php namespace peer\server;
 
+use io\OperationFailed;
 use lang\SystemException;
 
 /**
@@ -34,7 +35,7 @@ public function service() {
     while (!$this->terminate) {
       try {
         $m= $this->socket->accept();
-      } catch (\io\IOException $e) {
+      } catch (OperationFailed $e) {
         $this->shutdown();
         break;
       }
@@ -84,7 +85,7 @@ public function service() {
         do {
           try {
             foreach ($this->protocol->handleData($m) ?? [] as $_) { }
-          } catch (\io\IOException $e) {
+          } catch (OperationFailed $e) {
             $this->protocol->handleError($m, $e);
             break;
           }

src/main/php/peer/server/PreforkingServer.class.php

@@ -1,5 +1,6 @@
 <?php namespace peer\server;
 
+use io\OperationFailed;
 use lang\RuntimeError;
 use util\log\Traceable;
 
@@ -130,7 +131,7 @@ public function handleChild() {
 
         try {
           foreach ($this->protocol->handleData($m) ?? [] as $_) { }
-        } catch (\io\IOException $e) {
+        } catch (OperationFailed $e) {
           $this->protocol->handleError($m, $e);
           break;
         }

src/main/php/peer/server/Server.class.php

@@ -1,5 +1,6 @@
 <?php namespace peer\server;
 
+use io\OperationFailed;
 use peer\{BSDServerSocket, ServerSocket};
 
 /**
@@ -191,7 +192,7 @@ public function service() {
         $lastAction[$index]= $currentTime;
         try {
           foreach ($this->protocol->handleData($handles[$index]) ?? [] as $_) { }
-        } catch (\io\IOException $e) {
+        } catch (OperationFailed $e) {
           $this->protocol->handleError($handles[$index], $e);
           $handles[$index]->close();
           unset($handles[$index]);