Skip to content

Add support for BinaryFileResponse #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for BinaryFileResponse #59

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f872d8f
Add support for BinaryFileResponse
Deltachaos May 10, 2020
9dd898a
Merge tag '0.1.16' of https://github.com/driftphp/server into binary-…
Deltachaos Nov 26, 2020
20ed86f
remove duplicate use
Deltachaos Nov 26, 2020
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
75 changes: 46 additions & 29 deletions src/RequestHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,20 @@
use Drift\HttpKernel\AsyncKernel;
use Drift\Server\Context\ServerContext;
use Drift\Server\Mime\MimeTypeChecker;
use React\Http\Io\HttpBodyStream;
use function React\Promise\all;
use React\Promise\FulfilledPromise;
use function React\Promise\resolve;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Http\Message\UploadedFileInterface as PsrUploadedFile;
use React\Filesystem\FilesystemInterface;
use React\Http\Message\Response as ReactResponse;
use function React\Promise\all;
use React\Promise\PromiseInterface;
use function React\Promise\resolve;
use React\Stream\ReadableStreamInterface;
use React\Stream\ThroughStream;
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;
Expand Down Expand Up @@ -289,35 +292,49 @@ 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);
});
} 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