grpc-web 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 758ff05af92607617e668f99e32a0fb1e39e8795dd99a4d617e7de4d18a593df
-  data.tar.gz: 0fc70d8bf94ddb52d1a747590682f56750b2c57f2add9f7206cd4e20138bb998
+  metadata.gz: 9202ce0cf9954bd26bebc9d1dba4db3f2a4ed092eeda0c84b6644389bd1a571f
+  data.tar.gz: 29b84608c5fb180f545a82f62ac4f4d9bafa0353130eb3c3b7e091cc972e4412
 SHA512:
-  metadata.gz: 4ccebf90c39a63a496dfb7d5f518f5a7edb31c62b13b62e0fd01d6162a9804c81ee1d7032c56fbc822e1b51988339904471c0017966cbc65ef2ff8aefeeccf59
-  data.tar.gz: ffce3e4c465840373a5c17ca6eff72056ddd86301e3d5743b126f664e7db51ed185fcfe3468d66cf9bd2e0a26697cab4d7a3fa26c1c926f0b7a905c4b5638e21
+  metadata.gz: 223f2f529c645fd8430c1012cde634bd56b8f199d1fdfe41022ef7114ed18ef20c834f1ef9c1fe6c68875e5587d53a6b5620c9be551e517900472832bce9d3c0
+  data.tar.gz: d89fd1ac940705391250e67a02ad2376a985536dc3c75acaed770001e39911a45d8be97c1c686551ce5e6efa567f6790d6a7618090af52a4a87bcabfd90db3f3

data/lib/grpc_web/client/client_executor.rb

@@ -40,23 +40,37 @@ module GRPCWeb::ClientExecutor
       request.body = request_body
       request.basic_auth uri.user, uri.password if uri.userinfo
 
-      Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
-        http.request(request)
+      begin
+        Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+          http.request(request)
+        end
+      rescue StandardError => e
+        raise ::GRPC::Unavailable, e.message
       end
     end
 
     def handle_response(resp)
-      unless resp.is_a?(Net::HTTPSuccess)
-        raise "Received #{resp.code} #{resp.message} response: #{resp.body}"
+      begin
+        frames = ::GRPCWeb::MessageFraming.unpack_frames(resp.body)
+        headers = extract_headers(frames)
+      rescue StandardError
+        headers = {}
+        error_unpacking_frames = true
       end
+      raise_on_response_errors(resp, headers, error_unpacking_frames)
 
-      frames = ::GRPCWeb::MessageFraming.unpack_frames(resp.body)
-      header_frame = frames.find(&:header?)
-      headers = parse_headers(header_frame.body) if header_frame
-      raise_on_error(headers)
       frames.find(&:payload?).body
     end
 
+    def extract_headers(frames)
+      header_frame = frames.find(&:header?)
+      if header_frame
+        parse_headers(header_frame.body)
+      else
+        {}
+      end
+    end
+
     def parse_headers(header_str)
       headers = {}
       lines = header_str.split(/\r?\n/)
@@ -67,15 +81,34 @@ module GRPCWeb::ClientExecutor
       headers
     end
 
-    def raise_on_error(headers)
-      return unless headers
-
+    def raise_on_response_errors(resp, headers, error_unpacking_frames)
       status_str = headers[GRPC_STATUS_HEADER]
       status_code = status_str.to_i if status_str && status_str == status_str.to_i.to_s
 
+      # see https://github.com/grpc/grpc/blob/master/doc/http-grpc-status-mapping.md
       if status_code && status_code != 0
         raise ::GRPC::BadStatus.new_status_exception(status_code, headers[GRPC_MESSAGE_HEADER])
       end
+
+      case resp
+      when Net::HTTPBadRequest # 400
+        raise ::GRPC::Internal, resp.message
+      when Net::HTTPUnauthorized # 401
+        raise ::GRPC::Unauthenticated, resp.message
+      when Net::HTTPForbidden # 403
+        raise ::GRPC::PermissionDenied, resp.message
+      when Net::HTTPNotFound # 404
+        raise ::GRPC::Unimplemented, resp.message
+      when Net::HTTPTooManyRequests, # 429
+          Net::HTTPBadGateway, # 502
+          Net::HTTPServiceUnavailable, # 503
+          Net::HTTPGatewayTimeOut # 504
+        raise ::GRPC::Unavailable, resp.message
+      else
+        raise ::GRPC::Unknown, resp.message unless resp.is_a?(Net::HTTPSuccess) # 200
+        raise ::GRPC::Internal, resp.message if error_unpacking_frames
+        raise ::GRPC::Unknown, resp.message if status_code.nil?
+      end
     end
   end
 end

data/lib/grpc_web/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GRPCWeb
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc-web
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - James Shkolnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc