Merge branch 'hotfix/3.1.4' into develop

Author: lx-kevinmeijer

VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

composer.json

@@ -21,7 +21,7 @@
     "require": {
         "php": "^7.4.0 || ^8.0.0",
         "ext-sockets": "*",
-        "psr/log": "^1.0"
+        "psr/log": "^1.0 || ^2.0 || ^3.0"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -494,7 +494,9 @@ protected function _handlePacket(string $newData) : \Generator {
 
                             if ($res === FALSE) {
 
-                                yield new Update\Error(Update\Error::C_WRITE_INVALID_TARGET_STREAM, $this);
+                                $errUpdate = new Update\Error(Update\Error::C_WRITE_INVALID_TARGET_STREAM, $this);
+                                $errUpdate->setAdditionalInfo(error_get_last()['message'] ?? '');
+                                yield $errUpdate;
 
                                 $this->close();
 
@@ -656,7 +658,9 @@ public function handleWrite() : \Generator {
 
                 $this->_log(LogLevel::DEBUG, '    fwrite failed');
 
-                yield new Update\Error(Update\Error::C_WRITE, $this);
+                $errUpdate = new Update\Error(Update\Error::C_WRITE, $this);
+                $errUpdate->setAdditionalInfo(error_get_last()['message'] ?? '');
+                yield $errUpdate;
 
             } elseif ($bytesWritten === $bytesToWrite) {
 

src/PHPWebSockets/AConnection.php

@@ -39,6 +39,11 @@ abstract class AUpdate {
      */
     protected $_sourceConnection = NULL;
 
+    /**
+     * @var string
+     */
+    protected $_additionalInfo = '';
+
     /**
      * @var array|null
      */
@@ -71,6 +76,24 @@ public function getSourceConnection() : ?AConnection {
         return $this->_sourceConnection;
     }
 
+    /**
+     * Sets additional information to pass on for error handling
+     *
+     * @param string $info
+     *
+     * @return void
+     */
+    public function setAdditionalInfo(string $info) : void {
+        $this->_additionalInfo = $info;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAdditionalInfo() : string {
+        return $this->_additionalInfo;
+    }
+
     /**
      * @return array|null
      */
@@ -88,6 +111,6 @@ public function getCode() : int {
     }
 
     public function __toString() {
-        return 'AUpdate) (C: ' . $this->getCode() . ')';
+        return 'AUpdate) (C: ' . $this->getCode() . ')' . ($this->_additionalInfo ? ' Additional info: ' . $this->_additionalInfo : '');
     }
 }

src/PHPWebSockets/AUpdate.php

@@ -230,9 +230,13 @@ public function handleRead() : \Generator {
         $this->_log(LogLevel::DEBUG, __METHOD__);
 
         $readRate = $this->getReadRate();
-        $newData = fread($this->getStream(), min($this->_currentFrameRemainingBytes ?? $readRate, $readRate));
+        $newData = @fread($this->getStream(), min($this->_currentFrameRemainingBytes ?? $readRate, $readRate));
         if ($newData === FALSE) {
-            yield new Update\Error(Update\Error::C_READ, $this);
+
+            $errUpdate = new Update\Error(Update\Error::C_READ, $this);
+            $errUpdate->setAdditionalInfo(error_get_last()['message'] ?? '');
+
+            yield $errUpdate;
 
             return;
         }

src/PHPWebSockets/Client.php

@@ -124,7 +124,10 @@ public function handleRead() : \Generator {
         $readRate = $this->getReadRate();
         $newData = @fread($this->getStream(), min($this->_currentFrameRemainingBytes ?? $readRate, $readRate));
         if ($newData === FALSE) {
-            yield new Update\Error(Update\Error::C_READ, $this);
+
+            $errUpdate = new Update\Error(Update\Error::C_READ, $this);
+            $errUpdate->setAdditionalInfo(error_get_last()['message'] ?? '');
+            yield $errUpdate;
 
             return;
         }

src/PHPWebSockets/Server/Connection.php

@@ -91,6 +91,6 @@ public function __toString() {
 
         $code = $this->getCode();
 
-        return 'Error) ' . self::StringForCode($code) . ' (C: ' . $code . ')';
+        return 'Error) ' . self::StringForCode($code) . ' (C: ' . $code . ')' . ($this->_additionalInfo ? ' Additional info: ' . $this->_additionalInfo : '');
     }
 }

src/PHPWebSockets/Update/Error.php

@@ -138,6 +138,6 @@ public function __toString() {
 
         $code = $this->getCode();
 
-        return 'Read) ' . self::StringForCode($code) . ' (C: ' . $code . ')';
+        return 'Read) ' . self::StringForCode($code) . ' (C: ' . $code . ')' . ($this->_additionalInfo ? ' Additional info: ' . $this->_additionalInfo : '');;
     }
 }