fix java php and ruby

Author: millotp

clients/algoliasearch-client-java/algoliasearch/src/main/java/com/algolia/internal/interceptors/RetryStrategy.java

@@ -84,6 +84,9 @@ private Response handleResponse(StatefulHost host, @Nonnull Response response) t
 
     try {
       String message = response.body() != null ? response.body().string() : response.message();
+      if (response.header("Content-Type", "application/json").contains("text/html")) {
+        message = response.message();
+      }
       throw isRetryable(response)
         ? new AlgoliaRequestException(message, response.code())
         : new AlgoliaApiException(message, response.code());

clients/algoliasearch-client-php/lib/Http/CurlHttpClient.php

@@ -116,11 +116,12 @@ public function sendRequest(
         $statusCode = (int) curl_getinfo($curlHandle, CURLINFO_HTTP_CODE);
         $responseBody = curl_multi_getcontent($curlHandle);
         $error = curl_error($curlHandle);
+        $contentType = curl_getinfo($curlHandle, CURLINFO_CONTENT_TYPE);
 
         $this->releaseMHandle($curlHandle);
         curl_close($curlHandle);
 
-        return new Response($statusCode, [], $responseBody, '1.1', $error);
+        return new Response($statusCode, ['Content-Type' => $contentType], $responseBody, '1.1', $error);
     }
 
     private function getMHandle($curlHandle)

clients/algoliasearch-client-php/lib/RetryStrategy/ApiWrapper.php

@@ -247,6 +247,11 @@ private function handleResponse(
             throw new RetriableException('Retriable failure on '.$request->getUri()->getHost().': '.$reason, $statusCode);
         }
 
+        // handle HTML error responses
+        if (false !== strpos($response->getHeaderLine('Content-Type'), 'text/html')) {
+            throw new AlgoliaException($statusCode.': '.$response->getReasonPhrase(), $statusCode);
+        }
+
         $responseArray = Helpers::json_decode($body, true);
 
         if (404 === $statusCode) {

clients/algoliasearch-client-ruby/lib/algolia/error.rb

@@ -27,12 +27,12 @@ def initialize(message, errors = [])
   # which is also included in the response attribute.
   #
   class AlgoliaHttpError < AlgoliaError
-    attr_accessor :code, :message
+    attr_accessor :code, :http_message
 
     def initialize(code, message)
       self.code = code
-      self.message = message
-      super("#{self.code()}: #{self.message()}")
+      self.http_message = message
+      super("#{code}: #{message}")
     end
   end
 end

clients/algoliasearch-client-ruby/lib/algolia/transport/http/http_requester.rb

@@ -39,14 +39,14 @@ def send_request(host, method, path, body, query_params, headers, timeout, conne
             @logger.info("Request succeeded. Response status: #{response.status}, body: #{response.body}")
           end
 
-          return Http::Response.new(status: response.status, body: response.body, headers: response.headers)
+          return Http::Response.new(status: response.status, reason_phrase: response.reason_phrase, body: response.body, headers: response.headers)
         end
 
         if ENV["ALGOLIA_DEBUG"]
           @logger.info("Request failed. Response status: #{response.status}, error: #{response.body}")
         end
 
-        Http::Response.new(status: response.status, error: response.body, headers: response.headers)
+        Http::Response.new(status: response.status, reason_phrase: response.reason_phrase, error: response.body, headers: response.headers)
       rescue Faraday::TimeoutError => e
         @logger.info("Request timed out. Error: #{e.message}") if ENV["ALGOLIA_DEBUG"]
         Http::Response.new(error: e.message, has_timed_out: true)

clients/algoliasearch-client-ruby/lib/algolia/transport/http/response.rb

@@ -1,20 +1,22 @@
 module Algolia
   module Http
     class Response
-      attr_reader :status, :body, :error, :headers, :has_timed_out, :network_failure
+      attr_reader :status, :reason_phrase, :body, :error, :headers, :has_timed_out, :network_failure
 
       # used for the echo requester
       attr_reader :method, :path, :query_params, :host, :timeout, :connect_timeout
 
       #
       # @option status    [String]  Response status
+      # @option reason_phrase    [String]  Response reason phrase
       # @option body    [String]  Response body
       # @option error    [String]  Response error or caught error
       # @option headers    [String]  Response headers
       # @option has_timed_out    [String]  If the request has timed out
       #
       def initialize(opts = {})
         @status = opts[:status]
+        @reason_phrase = opts[:reason_phrase]
         @body = opts[:body]
         @error = opts[:error] || ""
         @headers = opts[:headers] || ""

clients/algoliasearch-client-ruby/lib/algolia/transport/transport.rb

@@ -69,6 +69,11 @@ def request(call_type, method, path, body, opts = {})
             network_failure: response.network_failure
           )
           if outcome == FAILURE
+            # handle HTML error
+            if response.headers["content-type"].include?("text/html")
+              raise Algolia::AlgoliaHttpError.new(response.status, response.reason_phrase)
+            end
+
             decoded_error = JSON.parse(response.error, :symbolize_names => true)
             raise Algolia::AlgoliaHttpError.new(response.status, decoded_error[:message])
           end

tests/CTS/client/ingestion/api.json

@@ -26,12 +26,12 @@
           "error": {
             "csharp": "<html><body>429 too many requests</body></html>",
             "go": "API error [429] Too Many Requests",
-            "java": "Status Code: 429 - <html><body>429 Too Many Requests</body></html>",
+            "java": "Status Code: 429 - Too Many Requests",
             "javascript": "<html><body>429 Too Many Requests</body></html>",
             "kotlin": "Client request(GET http://%localhost%:6676/1/html-error) invalid: 429 Too Many Requests. Text: \\\"<html><body>429 Too Many Requests</body></html>\\\"",
-            "php": "json_decode error: Syntax error",
+            "php": "429: Too Many Requests",
             "python": "Too Many Requests",
-            "ruby": "unexpected token at '<html><body>429 Too Many Requests</body></html>'",
+            "ruby": "429: Too Many Requests",
             "scala": "<html><body>429 Too Many Requests</body></html>",
             "swift": "HTTP error: Status code: 429 Message: No message"
           }