fix: add streaming flag and error handling

src/Api/ErrorParser/AbstractErrorParser.php

@@ -7,6 +7,7 @@
 use Aws\Api\StructureShape;
 use Aws\CommandInterface;
 use Psr\Http\Message\ResponseInterface;
+use SimpleXMLElement;
 
 abstract class AbstractErrorParser
 {
@@ -27,23 +28,10 @@ public function __construct(?Service $api = null)
     }
 
     abstract protected function payload(
-        ResponseInterface $response,
+        ResponseInterface|SimpleXMLElement|array $responseOrParsedBody,
         StructureShape $member
     );
 
-    protected function extractPayload(
-        StructureShape $member,
-        ResponseInterface $response
-    ) {
-        if ($member instanceof StructureShape) {
-            // Structure members parse top-level data into a specific key.
-            return $this->payload($response, $member);
-        } else {
-            // Streaming data is just the stream from the response body.
-            return $response->getBody();
-        }
-    }
-
     protected function populateShape(
         array &$data,
         ResponseInterface $response,
@@ -57,16 +45,15 @@ protected function populateShape(
             if (!empty($data['code'])) {
 
                 $errors = $this->api->getOperation($command->getName())->getErrors();
-                foreach ($errors as $key => $error) {
+                foreach ($errors as $error) {
 
                     // If error code matches a known error shape, populate the body
                     if ($this->errorCodeMatches($data, $error)) {
-                        $modeledError = $error;
-                        $data['body'] = $this->extractPayload(
-                            $modeledError,
-                            $response
+                        $data['body'] = $this->payload(
+                            $data['parsed'] ?? $response,
+                            $error,
                         );
-                        $data['error_shape'] = $modeledError;
+                        $data['error_shape'] = $error;
 
                         foreach ($error->getMembers() as $name => $member) {
                             switch ($member['location']) {

src/Api/ErrorParser/JsonParserTrait.php

@@ -3,7 +3,9 @@
 
 use Aws\Api\Parser\PayloadParserTrait;
 use Aws\Api\StructureShape;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\ResponseInterface;
+use SimpleXMLElement;
 
 /**
  * Provides basic JSON error parsing functionality.
@@ -37,10 +39,24 @@ private function genericHandler(ResponseInterface $response): array
             );
         }
 
-        $parsedBody = null;
         $body = $response->getBody();
-        if (!$body->isSeekable() || $body->getSize()) {
-            $parsedBody = $this->parseJson((string) $body, $response);
+        // If the body is not seekable then, read the full message
+        // before de-serializing
+        if (!$body->isSeekable()) {
+            $tempBody = Utils::streamFor();
+            Utils::copyToStream($body, $tempBody);
+            $body = $tempBody;
+        }
+
+        // Cast it to string
+        $body = (string) $body;
+        $parsedBody = [];
+
+        // Avoid parsing an empty body
+        if (!empty($body)) {
+            // Parsing the body to avoid having to read the response body again.
+            // This will avoid issues when the body is not seekable
+            $parsedBody = $this->parseJson($body, $response);
         }
 
         // Parse error code from response body
@@ -129,14 +145,13 @@ private function extractErrorCode(string $rawErrorCode): string
     }
 
     protected function payload(
-        ResponseInterface $response,
+        ResponseInterface|SimpleXMLElement|array $responseOrParsedBody,
         StructureShape $member
     ) {
-        $body = $response->getBody();
-        if (!$body->isSeekable() || $body->getSize()) {
-            $jsonBody = $this->parseJson($body, $response);
-        } else {
-            $jsonBody = (string) $body;
+        $jsonBody = $responseOrParsedBody;
+        if ($responseOrParsedBody instanceof ResponseInterface) {
+            $body = $responseOrParsedBody->getBody();
+            $jsonBody = $this->parseJson($body, $responseOrParsedBody);
         }
 
         return $this->parser->parse($member, $jsonBody);

src/Api/ErrorParser/JsonRpcErrorParser.php

@@ -28,20 +28,25 @@ public function __invoke(
         $data = $this->genericHandler($response);
 
         // Make the casing consistent across services.
-        if ($data['parsed']) {
-            $data['parsed'] = array_change_key_case($data['parsed']);
+        $parsed = $data['parsed'] ?? null;
+        if ($parsed) {
+            $parsed = array_change_key_case($data['parsed']);
         }
 
-        if (isset($data['parsed']['__type'])) {
+        if (isset($parsed['__type'])) {
             if (!isset($data['code'])) {
-                $parts = explode('#', $data['parsed']['__type']);
-                $data['code'] = isset($parts[1]) ? $parts[1] : $parts[0];
+                $parts = explode('#', $parsed['__type']);
+                $data['code'] = $parts[1] ?? $parts[0];
             }
-            $data['message'] = $data['parsed']['message'] ?? null;
+
+            $data['message'] = $parsed['message'] ?? null;
         }
 
         $this->populateShape($data, $response, $command);
 
+        // Now lets make parsed to be all lowercase
+        $data['parsed'] = $parsed;
+
         return $data;
     }
 }

src/Api/ErrorParser/RestJsonErrorParser.php

@@ -38,9 +38,14 @@ public function __invoke(
             $data['type'] = strtolower($data['type']);
         }
 
+        // Make the casing consistent across services.
+        $parsed = $data['parsed'] ?? null;
+        if ($parsed) {
+            $parsed = array_change_key_case($data['parsed']);
+        }
+
         // Retrieve error message directly
-        $data['message'] = $data['parsed']['message']
-            ?? ($data['parsed']['Message'] ?? null);
+        $data['message'] = $parsed['message'] ?? null;
 
         $this->populateShape($data, $response, $command);
 

src/Api/ErrorParser/XmlErrorParser.php

@@ -1,11 +1,13 @@
 <?php
 namespace Aws\Api\ErrorParser;
 
+use Aws\Api\Parser\Exception\ParserException;
 use Aws\Api\Parser\PayloadParserTrait;
 use Aws\Api\Parser\XmlParser;
 use Aws\Api\Service;
 use Aws\Api\StructureShape;
 use Aws\CommandInterface;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -38,7 +40,17 @@ public function __invoke(
         ];
 
         $body = $response->getBody();
-        if ($body->getSize() > 0) {
+        if (!$body->isSeekable()) {
+            $tempBody = Utils::streamFor();
+            Utils::copyToStream($body, $tempBody);
+            $body = $tempBody;
+        }
+
+        // Cast it to string
+        $body = (string) $body;
+
+        // Parse just if is not empty
+        if (!empty($body)) {
             $this->parseBody($this->parseXml($body, $response), $data);
         } else {
             $this->parseHeaders($response, $data);
@@ -97,15 +109,27 @@ protected function registerNamespacePrefix(\SimpleXMLElement $element)
     }
 
     protected function payload(
-        ResponseInterface $response,
+        ResponseInterface|\SimpleXMLElement|array $responseOrParsedBody,
         StructureShape $member
     ) {
-        $xmlBody = $this->parseXml($response->getBody(), $response);
+        $xmlBody = $responseOrParsedBody;
+        if ($responseOrParsedBody instanceof ResponseInterface) {
+            $xmlBody = $this->parseXml(
+                $responseOrParsedBody->getBody(),
+                $responseOrParsedBody
+            );
+        }
+
+
         $prefix = $this->registerNamespacePrefix($xmlBody);
         $errorBody = $xmlBody->xpath("//{$prefix}Error");
 
         if (is_array($errorBody) && !empty($errorBody[0])) {
             return $this->parser->parse($member, $errorBody[0]);
         }
+
+        throw new ParserException(
+            "Error element not found in parsed body"
+        );
     }
 }

src/Api/Operation.php

@@ -89,7 +89,7 @@ public function getOutput()
     /**
      * Get an array of operation error shapes.
      *
-     * @return Shape[]
+     * @return StructureShape[]
      */
     public function getErrors()
     {

src/Api/Parser/QueryParser.php

@@ -41,7 +41,7 @@ public function __invoke(
     ) {
         $output = $this->api->getOperation($command->getName())->getOutput();
         $body = $response->getBody();
-        $xml = !$body->isSeekable() || $body->getSize()
+        $xml = (!$body->isSeekable() || $body->getSize())
             ? $this->parseXml($body, $response)
             : null;
 

src/AwsClient.php

@@ -283,6 +283,7 @@ public function __construct(array $args)
             $args['with_resolved']($config);
         }
         $this->addUserAgentMiddleware($config);
+        $this->addEventStreamHttpFlagMiddleware();
     }
 
     public function getHandlerList()
@@ -643,6 +644,33 @@ private function addUserAgentMiddleware($args)
         );
     }
 
+    /**
+     * Enables streaming the response by using the stream flag.
+     *
+     * @return void
+     */
+    private function addEventStreamHttpFlagMiddleware(): void
+    {
+        $this->getHandlerList()
+            -> appendInit(
+                function (callable $handler) {
+                    return function (CommandInterface $command, $request = null) use ($handler) {
+                        $operation = $this->getApi()->getOperation($command->getName());
+                        $output = $operation->getOutput();
+                        foreach ($output->getMembers() as $memberProps) {
+                            if (!empty($memberProps['eventstream'])) {
+                                $command['@http']['stream'] = true;
+                                break;
+                            }
+                        }
+
+                        return $handler($command, $request);
+                    };
+                },
+                'event-streaming-flag-middleware'
+            );
+    }
+
     /**
      * Retrieves client context param definition from service model,
      * creates mapping of client context param names with client-provided

src/CloudWatchLogs/CloudWatchLogsClient.php

@@ -199,29 +199,6 @@ class CloudWatchLogsClient extends AwsClient {
     public function __construct(array $args)
     {
         parent::__construct($args);
-        $this->addStreamingFlagMiddleware();
-    }
-
-    private function addStreamingFlagMiddleware()
-    {
-        $this->getHandlerList()
-            -> appendInit(
-                $this->getStreamingFlagMiddleware(),
-                'streaming-flag-middleware'
-            );
-    }
-
-    private function getStreamingFlagMiddleware(): callable
-    {
-        return function (callable $handler) {
-            return function (CommandInterface $command, $request = null) use ($handler) {
-                if (!empty(self::$streamingCommands[$command->getName()])) {
-                    $command['@http']['stream'] = true;
-                }
-
-                return $handler($command, $request);
-            };
-        };
     }
 
     /**

src/WrappedHttpHandler.php

@@ -166,19 +166,21 @@ private function parseError(
             throw new \RuntimeException('The HTTP handler was rejected without an "exception" key value pair.');
         }
 
-        $serviceError = "AWS HTTP error: " . $err['exception']->getMessage();
+        $serviceError = "AWS HTTP error:\n";
 
         if (!isset($err['response'])) {
             $parts = ['response' => null];
+            $serviceError .= $err['exception']->getMessage();
         } else {
             try {
                 $parts = call_user_func(
                     $this->errorParser,
                     $err['response'],
                     $command
                 );
-                $serviceError .= " {$parts['code']} ({$parts['type']}): "
-                    . "{$parts['message']} - " . $err['response']->getBody();
+
+                $serviceError .= "{$parts['code']} ({$parts['type']}): "
+                    . "{$parts['message']}";
             } catch (ParserException $e) {
                 $parts = [];
                 $serviceError .= ' Unable to parse error information from '