timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Use the same API client instance across the codebase

Browse Source
This commit is contained in:
Timothy Warren 2018-12-07 10:24:42 -05:00
parent 63a50f7ed8
commit 105b0f52ca
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/API/ParallelAPIRequest.php
View File

@ -18,8 +18,7 @@ namespace Aviat\AnimeClient\API;
use function Amp\call; use function Amp\call;
use function Amp\Promise\{all, wait}; use function Amp\Promise\{all, wait};
use function Aviat\AnimeClient\getApiClient;
use Amp\Artax\{Client, DefaultClient};
/** /**
* Class to simplify making and validating simultaneous requests * Class to simplify making and validating simultaneous requests
@ -72,10 +71,7 @@ final class ParallelAPIRequest {
*/ */
public function makeRequests(): array public function makeRequests(): array
{ {
$client = new DefaultClient(); $client = getApiClient();
// Timeouts suck
$client->setOption(Client::OP_TRANSFER_TIMEOUT, 0);
$promises = []; $promises = [];
@ -98,10 +94,7 @@ final class ParallelAPIRequest {
*/ */
public function getResponses(): array public function getResponses(): array
{ {
$client = new DefaultClient(); $client = getApiClient();
// Timeouts suck
$client->setOption(Client::OP_TRANSFER_TIMEOUT, 0);
$promises = []; $promises = [];

21
src/AnimeClient.php
View File

@ -207,6 +207,24 @@ function checkFolderPermissions(ConfigInterface $config): array
return $errors; return $errors;
} }
/**
* Get an API Client, with better defaults
*
* @return DefaultClient
*/
function getApiClient ()
{
static $client;
if ($client === NULL)
{
$client = new DefaultClient;
$client->setOption(Client::OP_TRANSFER_TIMEOUT, 0);
}
return $client;
}
/** /**
* Simplify making a request with Artax * Simplify making a request with Artax
* *
@ -216,8 +234,7 @@ function checkFolderPermissions(ConfigInterface $config): array
*/ */
function getResponse ($request): Response function getResponse ($request): Response
{ {
$client = new DefaultClient; $client = getApiClient();
$client->setOption(Client::OP_TRANSFER_TIMEOUT, 0);
return wait($client->request($request)); return wait($client->request($request));
} }