Fix upload files

Author: BushlanovDev

src/Api.php

@@ -33,6 +33,7 @@
 use BushlanovDev\MaxMessengerBot\Models\UploadEndpoint;
 use BushlanovDev\MaxMessengerBot\Models\VideoAttachmentDetails;
 use InvalidArgumentException;
+use JsonException;
 use LogicException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -470,27 +471,51 @@ public function uploadAttachment(UploadType $type, string $filePath): AbstractAt
 
         $uploadEndpoint = $this->getUploadUrl($type);
 
-        $uploadResult = $this->client->upload(
-            $uploadEndpoint->url,
-            $fileHandle,
-            basename($filePath),
-        );
+        // For audio and video, the token is received *before* the upload
+        // The actual upload response is not JSON and can be ignored on success
+        if ($type === UploadType::Audio || $type === UploadType::Video) {
+            if (empty($uploadEndpoint->token)) {
+                throw new SerializationException(
+                    "API did not return a pre-upload token for type '$type->value'."
+                );
+            }
+            $this->client->upload($uploadEndpoint->url, $fileHandle, basename($filePath));
+            fclose($fileHandle);
 
+            return match ($type) {
+                UploadType::Audio => new AudioAttachmentRequest($uploadEndpoint->token),
+                UploadType::Video => new VideoAttachmentRequest($uploadEndpoint->token),
+            };
+        }
+
+        // For images and files, the token is in the response *after* the upload.
+        $responseBody = $this->client->upload($uploadEndpoint->url, $fileHandle, basename($filePath));
         fclose($fileHandle);
 
-        if (!isset($uploadResult['token'])) {
-            throw new SerializationException('Could not find "token" in upload server response.');
+        try {
+            $uploadResult = json_decode($responseBody, true, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+            throw new SerializationException('Failed to decode upload server response JSON.', 0, $e);
+        }
+
+        // Using switch because match expression arms cannot be code blocks.
+        switch ($type) {
+            case UploadType::Image:
+                $photoData = current($uploadResult['photos'] ?? []); // Get first photo from response
+                if (!isset($photoData['token'])) {
+                    throw new SerializationException('Could not find "token" in photo upload response.');
+                }
+                return PhotoAttachmentRequest::fromToken($photoData['token']);
+            case UploadType::File:
+                if (!isset($uploadResult['token'])) {
+                    throw new SerializationException('Could not find "token" in file upload response.');
+                }
+                return new FileAttachmentRequest($uploadResult['token']);
         }
 
-        return match ($type) {
-            UploadType::Image => PhotoAttachmentRequest::fromToken($uploadResult['token']),
-            UploadType::Video => new VideoAttachmentRequest($uploadResult['token']),
-            UploadType::Audio => new AudioAttachmentRequest($uploadResult['token']),
-            UploadType::File => new FileAttachmentRequest($uploadResult['token']), // @phpstan-ignore-line
-            default => throw new LogicException(
-                "Attachment creation for type '$type->value' is not yet implemented."
-            ),
-        };
+        // @codeCoverageIgnoreStart
+        throw new LogicException("Attachment creation for type '$type->value' is not yet implemented."); // @phpstan-ignore-line
+        // @codeCoverageIgnoreEnd
     }
 
     /**

src/Client.php

@@ -122,7 +122,7 @@ public function request(string $method, string $uri, array $queryParams = [], ar
     /**
      * @inheritDoc
      */
-    public function upload(string $uri, mixed $fileContents, string $fileName): array
+    public function upload(string $uri, mixed $fileContents, string $fileName): string
     {
         $boundary = '--------------------------' . microtime(true);
         $bodyStream = $this->streamFactory->createStream();
@@ -152,13 +152,7 @@ public function upload(string $uri, mixed $fileContents, string $fileName): arra
 
         $this->handleErrorResponse($response);
 
-        $responseBody = (string)$response->getBody();
-
-        try {
-            return json_decode($responseBody, true, 512, JSON_THROW_ON_ERROR);
-        } catch (JsonException $e) {
-            throw new SerializationException('Failed to decode upload server response JSON.', 0, $e);
-        }
+        return (string)$response->getBody();
     }
 
     /**

src/ClientApiInterface.php

@@ -32,10 +32,10 @@ public function request(string $method, string $uri, array $queryParams = [], ar
      * @param resource|string $fileContents File content (stream resource or string).
      * @param string $fileName The name of the file that will be sent to the server.
      *
-     * @return array<string, mixed>
+     * @return string The raw response body from the upload server.
      * @throws ClientApiException
      * @throws NetworkException
      * @throws SerializationException
      */
-    public function upload(string $uri, mixed $fileContents, string $fileName): array;
+    public function upload(string $uri, mixed $fileContents, string $fileName): string;
 }