Skip to content

Fake streamed file response #60

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

Closed
Deltachaos wants to merge 3 commits into from
Closed

Fake streamed file response #60

Changes from 2 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
bcf0152
Add fake support for StreamedResponse
Deltachaos May 10, 2020
32510a0
Removed duplicate block
Deltachaos Aug 6, 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
94 changes: 67 additions & 27 deletions src/RequestHandler.php
View file
Open in desktop
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,69 @@ 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();
});
} elseif($response instanceof StreamedResponse) {
Copy link
Copy Markdown
Member

@mmoreram mmoreram Jun 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this block is repeated?

Copy link
Copy Markdown
Author

@Deltachaos Deltachaos Aug 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, that was my fault

$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