src/API/ParallelAPIRequest.php

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

src/AnimeClient.php

@@ -207,6 +207,24 @@ function checkFolderPermissions(ConfigInterface $config): array
 	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
  *
@@ -216,8 +234,7 @@ function checkFolderPermissions(ConfigInterface $config): array
  */
 function getResponse ($request): Response
 {
-	$client = new DefaultClient;
+	$client = getApiClient();
-	$client->setOption(Client::OP_TRANSFER_TIMEOUT, 0);
 	return wait($client->request($request));
 }