From 1db221c7717067e0bb4f9beddcf67c35b5f8b641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 10 Sep 2021 10:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http-message/Message.php                   | 6 +++---
 http-message/ServerRequest.php             | 2 +-
 http-server/Constrict/ResponseEmitter.php  | 2 +-
 http-server/Constrict/WebSocketEmitter.php | 6 +++---
 http-server/Sender.php                     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/http-message/Message.php b/http-message/Message.php
index cb3cb8cf..a2ea5ae9 100644
--- a/http-message/Message.php
+++ b/http-message/Message.php
@@ -173,11 +173,11 @@ trait Message
 
 
 	/**
-	 * @return string
+	 * @return StreamInterface
 	 */
-	public function getBody(): string
+	public function getBody(): StreamInterface
 	{
-		return $this->stream->getContents();
+		return $this->stream;
 	}
 
 
diff --git a/http-message/ServerRequest.php b/http-message/ServerRequest.php
index 44c50b8f..84049122 100644
--- a/http-message/ServerRequest.php
+++ b/http-message/ServerRequest.php
@@ -171,7 +171,7 @@ class ServerRequest extends Request implements ServerRequestInterface
 		if (empty($this->parsedBody)) {
 			$callback = Context::getContext('with.parsed.body.callback');
 
-			$this->parsedBody = $callback($this->getBody());
+			$this->parsedBody = $callback($this->getBody()->getContents());
 		}
 		return $this->parsedBody;
 	}
diff --git a/http-server/Constrict/ResponseEmitter.php b/http-server/Constrict/ResponseEmitter.php
index 942ca36b..d144f39b 100644
--- a/http-server/Constrict/ResponseEmitter.php
+++ b/http-server/Constrict/ResponseEmitter.php
@@ -42,7 +42,7 @@ class ResponseEmitter implements Emitter
 		$response->header('Swoole-Version', swoole_version());
 
 		if (!($emitter instanceof DownloadInterface)) {
-			$response->end($emitter->getBody());
+			$response->end($emitter->getBody()->getContents());
 		} else {
 			$emitter->dispatch($response);
 		}
diff --git a/http-server/Constrict/WebSocketEmitter.php b/http-server/Constrict/WebSocketEmitter.php
index af2b877d..5b3ce4ab 100644
--- a/http-server/Constrict/WebSocketEmitter.php
+++ b/http-server/Constrict/WebSocketEmitter.php
@@ -17,13 +17,13 @@ class WebSocketEmitter implements Emitter
 
 	/**
 	 * @param mixed $response
-	 * @param ResponseInterface|\Server\Message\Response $emitter
+	 * @param ResponseInterface|\Protocol\Message\Response $emitter
 	 * @throws Exception
 	 */
-	public function sender(mixed $response, ResponseInterface|\Server\Message\Response $emitter): void
+	public function sender(mixed $response, ResponseInterface|\Protocol\Message\Response $emitter): void
 	{
 		$server = Kiri::getDi()->get(ServerManager::class)->getServer();
 
-		$server->push($response->fd, $emitter->getBody());
+		$server->push($response->fd, $emitter->getBody()->getContents());
 	}
 }
diff --git a/http-server/Sender.php b/http-server/Sender.php
index 46bb17ca..1f78a8e9 100644
--- a/http-server/Sender.php
+++ b/http-server/Sender.php
@@ -4,7 +4,7 @@ namespace Server;
 
 use Annotation\Inject;
 use Server\Constrict\Response;
-use Server\Message\Stream;
+use Protocol\Message\Stream;
 
 class Sender
 {
@@ -35,7 +35,7 @@ class Sender
 		if (!$server->isEstablished($fd)) {
 			return;
 		}
-		$server->push($fd, $body->getBody());
+		$server->push($fd, $body->getBody()->getContents());
 	}