Refactor, improve exception handling, tests

src/Client.php

@@ -26,8 +26,8 @@ class Client
 {
 	public const VERSION  = '2.0.0';
 	public const USER_AGENT_PREFIX = 'backblaze-b2-php/';
-	public const BASE_URI = 'https://api.backblazeb2.com';
-	public const B2_API_VERSION = '/b2api/v2';
+	public const BASE_URI = 'https://api.backblazeb2.com/';
+	public const B2_API_VERSION = 'b2api/v2/';
 
 	use FileOperationsTrait;
 	use BucketOperationsTrait;
@@ -92,7 +92,7 @@ public function __construct($config)
 	 * @param ClientInterface $client 
 	 */
 	public function authorizeAccount(): AccountAuthorization {
-		$response = $this->http->request('GET', Client::BASE_URI . Client::B2_API_VERSION . '/b2_authorize_account', [
+		$response = $this->http->request('GET', Client::BASE_URI . Client::B2_API_VERSION . 'b2_authorize_account', [
 			'headers' => [
 				'Authorization' => Utils::basicAuthorization($this->config->applicationKeyId(), $this->config->applicationKey()),
 			],
@@ -151,6 +151,16 @@ protected function createDefaultHttpClient(): ClientInterface {
 		return $client;
 	}
 
+	public function getAllowedBucketId(): ?string
+	{
+		return $this->accountAuthorization->getAllowed('bucketId') ?? null;
+	}
+
+	public function getAllowedBucketName(): ?string
+	{
+		return $this->accountAuthorization->getAllowed('bucketName') ?? null;
+	}
+
 	/**
 	 * @see __construct()
 	 */

src/Config.php

@@ -2,13 +2,9 @@
 
 namespace Zaxbux\BackblazeB2;
 
-use Exception;
-use GuzzleHttp\ClientInterface;
 use GuzzleHttp\HandlerStack;
 use Zaxbux\BackblazeB2\Classes\BuiltinAuthorizationCache;
-use Zaxbux\BackblazeB2\Http\ClientFactory;
 use Zaxbux\BackblazeB2\Interfaces\AuthorizationCacheInterface;
-use Zaxbux\BackblazeB2\Object\AccountAuthorization;
 
 /**
  * The main configuration object for the client.
@@ -66,7 +62,7 @@ class Config
 	/**
 	 * Maximum amount of time, in seconds, to wait before retrying a failed request.
 	 * Ignored for HTTP status codes: 429, 503.
-	 * Should be a power of 3.
+	 * Should be a power of 2.
 	 * 
 	 * @var int
 	 */
@@ -184,6 +180,7 @@ public static function fromArray($data): Config
 
 	private function setOptions(array $options) {
 		$this->handler = $options['handler'] ?? null;
+		$this->maxRetries = $options['maxRetries'] ?? 4;
 		$this->authorizationCache = $options['authorizationCache'] ?? new BuiltinAuthorizationCache();
 	}
 }

src/Exceptions/NotFoundException.php

@@ -2,4 +2,6 @@
 
 namespace Zaxbux\BackblazeB2\Exceptions;
 
-class NotFoundException extends B2APIException {}
+class NotFoundException extends \Exception {
+
+}

src/Exceptions/Request/AccessDeniedException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class AccessDeniedException extends B2APIException {}

src/Exceptions/Request/B2APIException.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+use GuzzleHttp\Exception\RequestException;
+use JsonException;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Throwable;
+
+class B2APIException extends RequestException {
+
+	private $statusCode;
+
+	public function __construct(
+		RequestInterface $request,
+		ResponseInterface $response,
+		?Throwable $previous = null
+	) {
+		$message = $response->getReasonPhrase();
+		$code = $response->getStatusCode();
+
+		try {
+			$responseJson = json_decode((string) $response->getBody(), true, 512, JSON_THROW_ON_ERROR);
+
+			$this->statusCode = $responseJson['status'] ?? null;
+			$message = $responseJson['message'] ?? null;
+			$code = $responseJson['code'] ?? null;
+		} catch (JsonException $e) {
+			// Ignore JSON exceptions, response object is available instead.
+		}
+
+		parent::__construct($message, $request, $response, $previous);
+		$this->code = $code;
+	}
+
+	/**
+	 * Get the status code as returned by the B2 API.
+	 */ 
+	public function getStatus(): ?string
+	{
+		return $this->statusCode;
+	}
+}

src/Exceptions/BadAuthTokenException.php → src/Exceptions/Request/BadAuthTokenException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class BadAuthTokenException extends B2APIException {}

src/Exceptions/BadRequestException.php → src/Exceptions/Request/BadRequestException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class BadRequestException extends B2APIException {}

src/Exceptions/CapExceededException.php → src/Exceptions/Request/CapExceededException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class CapExceededException extends B2APIException {}

src/Exceptions/Request/ConflictException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class ConflictException extends B2APIException {}

src/Exceptions/Request/DownloadCapExceededException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class DownloadCapExceededException extends CapExceededException {}

src/Exceptions/DuplicateBucketNameException.php → src/Exceptions/Request/DuplicateBucketNameException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class DuplicateBucketNameException extends B2APIException {}

src/Exceptions/Request/ExpiredAuthTokenException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class ExpiredAuthTokenException extends B2APIException {}

src/Exceptions/FileNotPresentException.php → src/Exceptions/Request/FileNotPresentException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class FileNotPresentException extends B2APIException {}

src/Exceptions/Request/InvalidBucketIdException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class InvalidBucketIdException extends B2APIException {}

src/Exceptions/Request/InvalidFileIdException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class InvalidFileIdException extends B2APIException {}

src/Exceptions/Request/MethodNotAllowedException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class MethodNotAllowedException extends B2APIException {}

src/Exceptions/Request/NotFoundException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class NotFoundException extends B2APIException {}

src/Exceptions/Request/OutOfRangeException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class OutOfRangeException extends B2APIException {}

src/Exceptions/Request/RangeNotSatisfiableException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class RangeNotSatisfiableException extends B2APIException {}

src/Exceptions/Request/RequestTimeoutException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class RequestTimeoutException extends B2APIException {}

src/Exceptions/Request/ServiceUnavailableException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class ServiceUnavailableException extends B2APIException {}

src/Exceptions/StorageCapExceededException.php → src/Exceptions/Request/StorageCapExceededException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class StorageCapExceededException extends CapExceededException {}

src/Exceptions/TooManyBucketsException.php → src/Exceptions/Request/TooManyBucketsException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class TooManyBucketsException extends B2APIException {}

src/Exceptions/TransactionCapExceededException.php → src/Exceptions/Request/TransactionCapExceededException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class TransactionCapExceededException extends CapExceededException {}

src/Exceptions/Request/UnauthorizedException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
+
+class UnauthorizedException extends B2APIException {}

src/Exceptions/UnsupportedException.php → src/Exceptions/Request/UnsupportedException.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace Zaxbux\BackblazeB2\Exceptions;
+namespace Zaxbux\BackblazeB2\Exceptions\Request;
 
 class UnsupportedException extends B2APIException {}