Merge branch 'main' of github-cclilshy:/cloudtay/ripple-http

Author: cclilshy

src/Server/Response.php

@@ -17,9 +17,12 @@
 use Ripple\Socket;
 use Ripple\Stream;
 use Ripple\Stream\Exception\ConnectionException;
+use Ripple\WaitGroup;
+use RuntimeException;
 use Throwable;
 
 use function basename;
+use function Co\go;
 use function Co\promise;
 use function filesize;
 use function implode;
@@ -36,7 +39,7 @@
  */
 class Response
 {
-    /*** @var mixed */
+    /*** @var mixed|Stream */
     protected mixed $body;
 
     /*** @var array */
@@ -259,36 +262,34 @@ public function sendContent(): static
         if (is_string($this->body)) {
             $this->stream->write($this->body);
         } elseif ($this->body instanceof Stream) {
-            promise(function (Closure $resolve, Closure $reject) {
-                $this->body->onReadable(function (Stream $body) use ($resolve, $reject) {
+            try {
+                while (!$this->body->eof()) {
+                    $this->body->waitForReadable();
+
                     $content = '';
-                    while ($buffer = $body->read(8192)) {
+                    while ($buffer = $this->body->read(8192)) {
                         $content .= $buffer;
                     }
 
-                    try {
-                        $this->stream->write($content);
-                    } catch (Throwable $exception) {
-                        $body->close();
-                        $reject($exception);
+                    if (!$content) {
+                        throw new RuntimeException('Stream is empty');
                     }
 
-                    if ($body->eof()) {
-                        $body->close();
-                        $resolve();
-                    }
-                });
-            })->await();
+                    $this->stream->write($content);
+                }
+            } finally {
+                $this->body->close();
+            }
         } elseif ($this->body instanceof Generator) {
             foreach ($this->body as $content) {
                 $this->stream->write($content);
             }
-            if ($this->body->getReturn() === false) {
-                $this->stream->close();
-            }
+
+            $this->stream->close();
         } else {
             throw new ConnectionException('The response content is illegal.', ConnectionException::ERROR_ILLEGAL_CONTENT);
         }
+
         return $this;
     }