Skip to content

Add always seekable body plugin #167

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.

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

Merged
merged 3 commits into from
Feb 23, 2019
Merged
Show file tree
Hide file tree
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
46 changes: 46 additions & 0 deletions spec/Plugin/RequestSeekableBodyPluginSpec.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

namespace spec\Http\Client\Common\Plugin;

use Http\Client\Common\Plugin;
use Http\Client\Common\Plugin\RequestSeekableBodyPlugin;
use Http\Message\Stream\BufferedStream;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\StreamInterface;

class RequestSeekableBodyPluginSpec extends ObjectBehavior
{
public function it_is_initializable()
{
$this->shouldHaveType(RequestSeekableBodyPlugin::class);
}

public function it_is_a_plugin()
{
$this->shouldImplement(Plugin::class);
}

public function it_decorate_request_body_if_not_seekable(RequestInterface $request, StreamInterface $requestStream)
{
$request->getBody()->shouldBeCalled()->willReturn($requestStream);
$requestStream->isSeekable()->shouldBeCalled()->willReturn(false);
$requestStream->getSize()->willReturn(null);

$request->withBody(Argument::type(BufferedStream::class))->shouldBeCalled()->willReturn($request);

$this->handleRequest($request, PluginStub::next(), function () {});
}

public function it_does_not_decorate_request_body_if_seekable(RequestInterface $request, StreamInterface $requestStream)
{
$request->getBody()->shouldBeCalled()->willReturn($requestStream);
$requestStream->isSeekable()->shouldBeCalled()->willReturn(true);
$requestStream->getSize()->willReturn(null);

$request->withBody(Argument::type(BufferedStream::class))->shouldNotBeCalled();

$this->handleRequest($request, PluginStub::next(), function () {});
}
}
56 changes: 56 additions & 0 deletions spec/Plugin/ResponseSeekableBodyPluginSpec.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?php

namespace spec\Http\Client\Common\Plugin;

use GuzzleHttp\Psr7\Request;
use Http\Client\Common\Plugin;
use Http\Client\Common\Plugin\ResponseSeekableBodyPlugin;
use Http\Client\Promise\HttpFulfilledPromise;
use Http\Message\Stream\BufferedStream;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;

class ResponseSeekableBodyPluginSpec extends ObjectBehavior
{
public function it_is_initializable()
{
$this->shouldHaveType(ResponseSeekableBodyPlugin::class);
}

public function it_is_a_plugin()
{
$this->shouldImplement(Plugin::class);
}

public function it_decorate_response_body_if_not_seekable(ResponseInterface $response, StreamInterface $responseStream)
{
$next = function () use ($response) {
return new HttpFulfilledPromise($response->getWrappedObject());
};

$response->getBody()->shouldBeCalled()->willReturn($responseStream);
$responseStream->isSeekable()->shouldBeCalled()->willReturn(false);
$responseStream->getSize()->willReturn(null);

$response->withBody(Argument::type(BufferedStream::class))->shouldBeCalled()->willReturn($response);

$this->handleRequest(new Request('GET', '/'), $next, function () {});
}

public function it_does_not_decorate_response_body_if_seekable(ResponseInterface $response, StreamInterface $responseStream)
{
$next = function () use ($response) {
return new HttpFulfilledPromise($response->getWrappedObject());
};

$response->getBody()->shouldBeCalled()->willReturn($responseStream);
$responseStream->isSeekable()->shouldBeCalled()->willReturn(true);
$responseStream->getSize()->willReturn(null);

$response->withBody(Argument::type(BufferedStream::class))->shouldNotBeCalled();

$this->handleRequest(new Request('GET', '/'), $next, function () {});
}
}
29 changes: 29 additions & 0 deletions src/Plugin/RequestSeekableBodyPlugin.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

declare(strict_types=1);

namespace Http\Client\Common\Plugin;

use Http\Message\Stream\BufferedStream;
use Http\Promise\Promise;
use Psr\Http\Message\RequestInterface;

/**
* Allow body used in request to be always seekable.
*
* @author Joel Wurtz <[email protected]>
*/
final class RequestSeekableBodyPlugin extends SeekableBodyPlugin
{
/**
* {@inheritdoc}
*/
public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
{
if (!$request->getBody()->isSeekable()) {
$request = $request->withBody(new BufferedStream($request->getBody(), $this->useFileBuffer, $this->memoryBufferSize));
}

return $next($request);
}
}
32 changes: 32 additions & 0 deletions src/Plugin/ResponseSeekableBodyPlugin.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

declare(strict_types=1);

namespace Http\Client\Common\Plugin;

use Http\Message\Stream\BufferedStream;
use Http\Promise\Promise;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;

/**
* Allow body used in response to be always seekable.
*
* @author Joel Wurtz <[email protected]>
*/
final class ResponseSeekableBodyPlugin extends SeekableBodyPlugin
{
/**
* {@inheritdoc}
*/
public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
{
return $next($request)->then(function (ResponseInterface $response) {
if ($response->getBody()->isSeekable()) {
return $response;
}

return $response->withBody(new BufferedStream($response->getBody(), $this->useFileBuffer, $this->memoryBufferSize));
});
}
}
41 changes: 41 additions & 0 deletions src/Plugin/SeekableBodyPlugin.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

namespace Http\Client\Common\Plugin;

use Http\Client\Common\Plugin;
use Symfony\Component\OptionsResolver\OptionsResolver;

/**
* @internal
*/
abstract class SeekableBodyPlugin implements Plugin
{
protected $useFileBuffer;

protected $memoryBufferSize;

/**
* @param array $config {
*
* @var bool $use_file_buffer Whether this plugin should use a file as a buffer if the stream is too big, defaults to true
* @var int $memory_buffer_size Max memory size in bytes to use for the buffer before it use a file, defaults to 2097152 (2 mb)
* }
*/
public function __construct(array $config = [])
{
$resolver = new OptionsResolver();
$resolver->setDefaults([
'use_file_buffer' => true,
'memory_buffer_size' => 2097152,
]);
$resolver->setAllowedTypes('use_file_buffer', 'bool');
$resolver->setAllowedTypes('memory_buffer_size', 'int');

$options = $resolver->resolve($config);

$this->useFileBuffer = $options['use_file_buffer'];
$this->memoryBufferSize = $options['memory_buffer_size'];
}
}