Handle Exception in callback function

src/Server.php

@@ -228,19 +228,29 @@ public function handleRequest(ConnectionInterface $conn, RequestInterface $reque
         );
 
         $callback = $this->callback;
-        $promise = \React\Promise\resolve($callback($request));
+        $promise = new Promise(function ($resolve, $reject) use ($callback, $request) {
+            $resolve($callback($request));
+        });
 
         $that = $this;
         $promise->then(
             function ($response) use ($that, $conn, $request) {
                 if (!$response instanceof ResponseInterface) {
-                    $that->emit('error', array(new \InvalidArgumentException('Invalid response type')));
+                    $message = 'The response callback is expected to resolve with an object implementing Psr\Http\Message\ResponseInterface, but resolved with "%s" instead.';
+                    $message = sprintf($message, is_object($response) ? get_class($response) : gettype($response));
+                    $exception = new \RuntimeException($message);
+
+                    $that->emit('error', array($exception));
                     return $that->writeError($conn, 500);
                 }
                 $that->handleResponse($conn, $response, $request->getProtocolVersion());
             },
-            function ($ex) use ($that, $conn) {
-                $that->emit('error', array($ex));
+            function ($error) use ($that, $conn) {
+                $message = 'The response callback is expected to resolve with an object implementing Psr\Http\Message\ResponseInterface, but rejected with "%s" instead.';
+                $message = sprintf($message, is_object($error) ? get_class($error) : gettype($error));
+                $exception = new \RuntimeException($message, null, $error instanceof \Exception ? $error : null);
+
+                $that->emit('error', array($exception));
                 return $that->writeError($conn, 500);
             }
         );
@@ -264,7 +274,6 @@ public function writeError(ConnectionInterface $conn, $code)
         $response = new Response(
             $code,
             array(
-                'Content-Length' => strlen($message),
                 'Content-Type' => 'text/plain'
             ),
             $message

tests/ServerTest.php

@@ -1657,6 +1657,11 @@ public function testReturnInvalidTypeWillResultInError()
             return "invalid";
         });
 
+        $exception = null;
+        $server->on('error', function (\Exception $ex) use (&$exception) {
+            $exception = $ex;
+        });
+
         $buffer = '';
         $this->connection
             ->expects($this->any())
@@ -1678,6 +1683,7 @@ function ($data) use (&$buffer) {
         $this->connection->emit('data', array($data));
 
         $this->assertContains("HTTP/1.1 500 Internal Server Error\r\n", $buffer);
+        $this->assertInstanceOf('RuntimeException', $exception);
     }
 
     public function testResolveWrongTypeInPromiseWillResultInError()
@@ -1806,6 +1812,108 @@ function ($data) use (&$buffer) {
         $this->assertNotContains("Transfer-Encoding", $buffer);
     }
 
+    public function testReturnRequestWillBeHandled()
+    {
+        $server = new Server($this->socket, function (RequestInterface $request) {
+            return new Response();
+        });
+
+        $buffer = '';
+        $this->connection
+            ->expects($this->any())
+            ->method('write')
+            ->will(
+                $this->returnCallback(
+                    function ($data) use (&$buffer) {
+                        $buffer .= $data;
+                    }
+                )
+            );
+
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = "GET / HTTP/1.0\r\n\r\n";
+
+        $data = $this->createGetRequest();
+
+        $this->connection->emit('data', array($data));
+
+        $this->assertContains("HTTP/1.1 200 OK\r\n", $buffer);
+    }
+
+    public function testExceptionThrowInCallBackFunctionWillResultInErrorMessage()
+    {
+        $server = new Server($this->socket, function (RequestInterface $request) {
+            throw new \Exception('hello');
+        });
+
+        $exception = null;
+        $server->on('error', function (\Exception $ex) use (&$exception) {
+            $exception = $ex;
+        });
+
+        $buffer = '';
+        $this->connection
+            ->expects($this->any())
+            ->method('write')
+            ->will(
+                $this->returnCallback(
+                    function ($data) use (&$buffer) {
+                        $buffer .= $data;
+                    }
+                )
+            );
+
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = "GET / HTTP/1.0\r\n\r\n";
+
+        $data = $this->createGetRequest();
+
+        $this->connection->emit('data', array($data));
+
+        $this->assertInstanceOf('RuntimeException', $exception);
+        $this->assertContains("HTTP/1.1 500 Internal Server Error\r\n", $buffer);
+        $this->assertEquals('hello', $exception->getPrevious()->getMessage());
+    }
+
+    public function testRejectOfNonExceptionWillResultInErrorMessage()
+    {
+        $server = new Server($this->socket, function (RequestInterface $request) {
+            return new Promise(function ($resolve, $reject) {
+                $reject('Invalid type');
+            });
+        });
+
+        $exception = null;
+        $server->on('error', function (\Exception $ex) use (&$exception) {
+            $exception = $ex;
+        });
+
+        $buffer = '';
+        $this->connection
+            ->expects($this->any())
+            ->method('write')
+            ->will(
+                $this->returnCallback(
+                    function ($data) use (&$buffer) {
+                        $buffer .= $data;
+                    }
+                )
+            );
+
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = "GET / HTTP/1.0\r\n\r\n";
+
+        $data = $this->createGetRequest();
+
+        $this->connection->emit('data', array($data));
+
+        $this->assertContains("HTTP/1.1 500 Internal Server Error\r\n", $buffer);
+        $this->assertInstanceOf('RuntimeException', $exception);
+    }
+
     private function createGetRequest()
     {
         $data = "GET / HTTP/1.1\r\n";