grpc-web 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9202ce0cf9954bd26bebc9d1dba4db3f2a4ed092eeda0c84b6644389bd1a571f
-  data.tar.gz: 29b84608c5fb180f545a82f62ac4f4d9bafa0353130eb3c3b7e091cc972e4412
+  metadata.gz: 39509d4c9ee70cd7953e8eb6758fecc4e52b9a5d7083523c7e98f2351bd5e836
+  data.tar.gz: 07f57eb761ac2f8fcca5e1970b4183bd6dd922b6358dd1a84214849ac1d0d4ec
 SHA512:
-  metadata.gz: 223f2f529c645fd8430c1012cde634bd56b8f199d1fdfe41022ef7114ed18ef20c834f1ef9c1fe6c68875e5587d53a6b5620c9be551e517900472832bce9d3c0
-  data.tar.gz: d89fd1ac940705391250e67a02ad2376a985536dc3c75acaed770001e39911a45d8be97c1c686551ce5e6efa567f6790d6a7618090af52a4a87bcabfd90db3f3
+  metadata.gz: 296dc4cb68871e7ba7fda02b3b47c0e7023affc6071fa03ee1eca981aec50726ed10dad81c66376cbcb4e72a67d26d1c0e621ea84db118e124aa33a80e2d6fa9
+  data.tar.gz: 56d1b594a34e952503a3fa4c34ff4e79bee14a1e495ae2d6d1b4916d46810ca31efd86f258ddb8ae788b45427e14d51f0671cdd343ff72b12a26047ca08295c1

data/lib/grpc_web/client/client_executor.rb

@@ -14,6 +14,7 @@ module GRPCWeb::ClientExecutor
 
     GRPC_STATUS_HEADER = 'grpc-status'
     GRPC_MESSAGE_HEADER = 'grpc-message'
+    GRPC_HEADERS = %W[x-grpc-web #{GRPC_STATUS_HEADER} #{GRPC_MESSAGE_HEADER}].freeze
 
     def request(uri, rpc_desc, params = {})
       req_proto = rpc_desc.input.new(params)
@@ -82,32 +83,37 @@ module GRPCWeb::ClientExecutor
     end
 
     def raise_on_response_errors(resp, headers, error_unpacking_frames)
+      metadata = headers.reject { |key, _| GRPC_HEADERS.include?(key) }
       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])
+        raise ::GRPC::BadStatus.new_status_exception(
+          status_code,
+          headers[GRPC_MESSAGE_HEADER],
+          metadata,
+        )
       end
 
       case resp
       when Net::HTTPBadRequest # 400
-        raise ::GRPC::Internal, resp.message
+        raise ::GRPC::Internal.new(resp.message, metadata)
       when Net::HTTPUnauthorized # 401
-        raise ::GRPC::Unauthenticated, resp.message
+        raise ::GRPC::Unauthenticated.new(resp.message, metadata)
       when Net::HTTPForbidden # 403
-        raise ::GRPC::PermissionDenied, resp.message
+        raise ::GRPC::PermissionDenied.new(resp.message, metadata)
       when Net::HTTPNotFound # 404
-        raise ::GRPC::Unimplemented, resp.message
+        raise ::GRPC::Unimplemented.new(resp.message, metadata)
       when Net::HTTPTooManyRequests, # 429
           Net::HTTPBadGateway, # 502
           Net::HTTPServiceUnavailable, # 503
           Net::HTTPGatewayTimeOut # 504
-        raise ::GRPC::Unavailable, resp.message
+        raise ::GRPC::Unavailable.new(resp.message, metadata)
       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?
+        raise ::GRPC::Unknown.new(resp.message, metadata) unless resp.is_a?(Net::HTTPSuccess) # 200
+        raise ::GRPC::Internal.new(resp.message, metadata) if error_unpacking_frames
+        raise ::GRPC::Unknown.new(resp.message, metadata) if status_code.nil?
       end
     end
   end

data/lib/grpc_web/server/message_serialization.rb

@@ -59,7 +59,7 @@ module GRPCWeb::MessageSerialization
     def serialize_error_response(response)
       ex = response.body
       if ex.is_a?(::GRPC::BadStatus)
-        header_str = generate_headers(ex.code, ex.details)
+        header_str = generate_headers(ex.code, ex.details, ex.metadata)
       else
         header_str = generate_headers(
           ::GRPC::Core::StatusCodes::UNKNOWN,
@@ -72,13 +72,19 @@ module GRPCWeb::MessageSerialization
 
     # If needed, trailers can be appended to the response as a 2nd
     # base64 encoded string with independent framing.
-    def generate_headers(status, message)
-      [
+    def generate_headers(status, message, metadata = {})
+      headers = [
         "grpc-status:#{status}",
         "grpc-message:#{message}",
         'x-grpc-web:1',
-        nil, # for trailing newline
-      ].join("\r\n")
+      ]
+      metadata.each do |name, value|
+        next if %w[grpc-status grpc-message x-grpc-web].include?(name)
+
+        headers << "#{name}:#{value}"
+      end
+      headers << nil # for trailing newline
+      headers.join("\r\n")
     end
   end
 end

data/lib/grpc_web/version.rb

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

metadata

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