Keep request body in memory also after consuming request body

Author: clue

src/Middleware/RequestBodyBufferMiddleware.php

@@ -4,10 +4,10 @@
 
 use OverflowException;
 use Psr\Http\Message\ServerRequestInterface;
+use React\Http\Io\BufferedBody;
 use React\Http\Io\IniUtil;
 use React\Promise\Stream;
 use React\Stream\ReadableStreamInterface;
-use RingCentral\Psr7\BufferStream;
 
 final class RequestBodyBufferMiddleware
 {
@@ -38,7 +38,7 @@ public function __invoke(ServerRequestInterface $request, $stack)
         if ($size === 0 || !$body instanceof ReadableStreamInterface) {
             // replace with empty body if body is streaming (or buffered size exceeds limit)
             if ($body instanceof ReadableStreamInterface || $size > $this->sizeLimit) {
-                $request = $request->withBody(new BufferStream(0));
+                $request = $request->withBody(new BufferedBody(''));
             }
 
             return $stack($request);
@@ -51,9 +51,7 @@ public function __invoke(ServerRequestInterface $request, $stack)
         }
 
         return Stream\buffer($body, $sizeLimit)->then(function ($buffer) use ($request, $stack) {
-            $stream = new BufferStream(\strlen($buffer));
-            $stream->write($buffer);
-            $request = $request->withBody($stream);
+            $request = $request->withBody(new BufferedBody($buffer));
 
             return $stack($request);
         }, function ($error) use ($stack, $request, $body) {

tests/ServerTest.php

@@ -110,6 +110,35 @@ function (ServerRequestInterface $request) use (&$called) {
         $this->assertSame('beforeokafter', $called);
     }
 
+    public function testPostFormData()
+    {
+        $loop = Factory::create();
+        $deferred = new Deferred();
+        $server = new Server($loop, function (ServerRequestInterface $request) use ($deferred) {
+            $deferred->resolve($request);
+        });
+
+        $server->listen($this->socket);
+        $this->socket->emit('connection', array($this->connection));
+        $this->connection->emit('data', array("POST / HTTP/1.0\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 7\r\n\r\nfoo=bar"));
+
+        $request = Block\await($deferred->promise(), $loop);
+        assert($request instanceof ServerRequestInterface);
+
+        $form = $request->getParsedBody();
+
+        $this->assertTrue(isset($form['foo']));
+        $this->assertEquals('bar', $form['foo']);
+
+        $this->assertEquals(array(), $request->getUploadedFiles());
+
+        $body = $request->getBody();
+
+        $this->assertSame(7, $body->getSize());
+        $this->assertSame(7, $body->tell());
+        $this->assertSame('foo=bar', (string) $body);
+    }
+
     public function testPostFileUpload()
     {
         $loop = Factory::create();
@@ -132,18 +161,52 @@ public function testPostFileUpload()
             }
         });
 
-        $parsedRequest = Block\await($deferred->promise(), $loop);
-        $this->assertNotEmpty($parsedRequest->getUploadedFiles());
-        $this->assertEmpty($parsedRequest->getParsedBody());
+        $request = Block\await($deferred->promise(), $loop);
+        assert($request instanceof ServerRequestInterface);
+
+        $this->assertEmpty($request->getParsedBody());
+
+        $this->assertNotEmpty($request->getUploadedFiles());
 
-        $files = $parsedRequest->getUploadedFiles();
+        $files = $request->getUploadedFiles();
 
         $this->assertTrue(isset($files['file']));
         $this->assertCount(1, $files);
 
         $this->assertSame('hello.txt', $files['file']->getClientFilename());
         $this->assertSame('text/plain', $files['file']->getClientMediaType());
         $this->assertSame("hello\r\n", (string)$files['file']->getStream());
+
+        $body = $request->getBody();
+
+        $this->assertSame(220, $body->getSize());
+        $this->assertSame(220, $body->tell());
+    }
+
+    public function testPostJsonWillNotBeParsedByDefault()
+    {
+        $loop = Factory::create();
+        $deferred = new Deferred();
+        $server = new Server($loop, function (ServerRequestInterface $request) use ($deferred) {
+            $deferred->resolve($request);
+        });
+
+        $server->listen($this->socket);
+        $this->socket->emit('connection', array($this->connection));
+        $this->connection->emit('data', array("POST / HTTP/1.0\r\nContent-Type: application/json\r\nContent-Length: 6\r\n\r\n[true]"));
+
+        $request = Block\await($deferred->promise(), $loop);
+        assert($request instanceof ServerRequestInterface);
+
+        $this->assertNull($request->getParsedBody());
+
+        $this->assertSame(array(), $request->getUploadedFiles());
+
+        $body = $request->getBody();
+
+        $this->assertSame(6, $body->getSize());
+        $this->assertSame(0, $body->tell());
+        $this->assertSame('[true]', (string) $body);
     }
 
     public function testServerReceivesBufferedRequestByDefault()