Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 57 additions & 27 deletions src/RequestHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
use Drift\Console\TimeFormatter;
use Drift\HttpKernel\AsyncKernel;
use Drift\Server\Mime\MimeTypeChecker;
use React\Http\Io\HttpBodyStream;
use function React\Promise\all;
use React\Promise\FulfilledPromise;
use React\Promise\Promise;
use function React\Promise\resolve;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\StreamInterface;
Expand All @@ -41,10 +44,13 @@
use React\Promise\PromiseInterface;
use React\Stream\ReadableStreamInterface;
use React\Stream\ThroughStream;
use RingCentral\Psr7\BufferStream;
use RingCentral\Psr7\Response as PSRResponse;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
use Throwable;

Expand Down Expand Up @@ -268,35 +274,59 @@ private function toServerResponse(
float $from
): PromiseInterface {
if ($response instanceof Response) {
$response = new PSRResponse(
$response->getStatusCode(),
$response->headers->all(),
$response->getContent()
);
if ($response instanceof BinaryFileResponse) {
$streamPromise = $this->filesystem->file($response->getFile()->getPathname())->open('r')->then(function (ReadableStreamInterface $stream) {
return new HttpBodyStream($stream, null);
});
} elseif($response instanceof StreamedResponse) {
$streamPromise = new Promise(function($resolve, $reject) use($response) {
$stream = new BufferStream();
$resolve($stream);
ob_start(function($data) use($stream, $resolve, &$isResolved) {
$stream->write($data);
}, 1);
$response->sendContent();
ob_end_flush();
});
} else {
$streamPromise = new FulfilledPromise($response->getContent());
}

$responsePromise = $streamPromise->then(function ($stream) use($response) {
return new PSRResponse(
$response->getStatusCode(),
$response->headers->all(),
$stream
);
});
} else {
$responsePromise = new FulfilledPromise($response);
}

return $this
->applyResponseEncoding($response, $symfonyRequest->headers->get('Accept-Encoding'))
->then(function (PSRResponse $response) use ($symfonyRequest, $from) {
$to = microtime(true);
$serverResponse =
new ServerResponseWithMessage(
$response,
$this->outputPrinter,
new ConsoleRequestMessage(
$symfonyRequest->getPathInfo(),
$symfonyRequest->getMethod(),
$response->getStatusCode(),
'',
TimeFormatter::formatTime($to - $from)
)
);

$symfonyRequest = null;
$symfonyResponse = null;

return $serverResponse;
});
return $responsePromise->then(function (PSRResponse $response) use ($symfonyRequest, $from) {
return $this
->applyResponseEncoding($response, $symfonyRequest->headers->get('Accept-Encoding'))
->then(function (PSRResponse $response) use ($symfonyRequest, $from) {
$to = microtime(true);
$serverResponse =
new ServerResponseWithMessage(
$response,
$this->outputPrinter,
new ConsoleRequestMessage(
$symfonyRequest->getPathInfo(),
$symfonyRequest->getMethod(),
$response->getStatusCode(),
'',
TimeFormatter::formatTime($to - $from)
)
);

$symfonyRequest = null;
$symfonyResponse = null;

return $serverResponse;
});
});
}

/**
Expand Down