grpc-rest 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628c8c0d79cbe90cfcb02c74d1f4e785ed25d7d56267bd1da54d4fe911ba0daa
-  data.tar.gz: a14292a527e3b1ae8c3455b3146c5aa9d3760d4cb11c5a1f206bba22e7690a67
+  metadata.gz: 624b3de8eba78302edff97ecf421a9d660fe781c72452b7f642fa5772e3a6234
+  data.tar.gz: 39143f78f27e6c0905cfb2092b23c4427c70c5810d78243935baf5c38bee9443
 SHA512:
-  metadata.gz: 64227c2f740fd93e1f9c1bcb3e4779fac6de80c47c5f85848b1ab785a5cde39347a03eee6184ab906937eac465ef40e601adcf0c625aeae97128440d9f8f6c55
-  data.tar.gz: 7c1a0b6bdc6f7d56380646b388fc8eca4755ad750d6a4054d1151d0052e2b661a2dafa4299b72cf883a7dc15fc71b0892fa166c64513b2c28d7f806010110cf6
+  metadata.gz: 1d3897f28befb1aadf27163d67771605116de984a80d86d9ae3b41d131729bfa75c0bd04c84f63ef622cf77637fe1958078d62e59afb1fc8cb95a073137e8733
+  data.tar.gz: 415c00d2059a1cbd9923d5689333f6ae8c07ac9f2c595e0abaed8183106aa6f30e2da751fdeefb5b856969a62fac5f6ae63e0e36cd146c409768f23df7e02a34

data/CHANGELOG

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 0.4.0 - 2025-07-08
+
+- Feature: Forward request headers to the gRPC call as metadata.
+- ***BREAKING CHANGE***: Update interceptors to pass a Gruf::Controller::Request instead of the raw gRPC request object. This allows e.g. checking metadata inside the interceptor.
+
+# 0.3.1 - 2025-07-02
+- Fix: Include full error backtrace in logs
+
 # 0.3.0 - 2025-06-11
 
 - Feature: Add `strict_mode` configuration for rejecting invalid JSON fields.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grpc-rest (0.2.1)
+    grpc-rest (0.3.1)
       google-protobuf (>= 4.30.2)
       grpc
       rails (>= 6.0)
@@ -88,11 +88,17 @@ GEM
     google-protobuf (4.30.2-arm64-darwin)
       bigdecimal
       rake (>= 13)
+    google-protobuf (4.30.2-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
     googleapis-common-protos-types (1.19.0)
       google-protobuf (>= 3.18, < 5.a)
     grpc (1.71.0-arm64-darwin)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
+    grpc (1.71.0-x86_64-linux)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.64.0)
     gruf (2.20.0)
       activesupport (> 4)

data/lib/generator/controller.rb.erb

@@ -21,7 +21,7 @@ class <%= service.name.demodulize %>Controller < ActionController::Base
       except(*%w(controller action <%= service.name.underscore %>))
     grpc_request = GrpcRest.init_request(<%= method.request_type %>, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["<%= method.name.underscore %>"], "<%= method.option_body %>", request.parameters)
-    render json: GrpcRest.send_request("<%= service.namespace %>::<%= service.name.classify %>", "<%= method.name.underscore %>", grpc_request, <%= method.rest_options.inspect %>)
+    render json: GrpcRest.send_request("<%= service.namespace %>::<%= service.name.classify %>", "<%= method.name.underscore %>", grpc_request, <%= method.rest_options.inspect %>, headers: request.headers)
   end
 <% end %>
 end

data/lib/grpc_rest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcRest
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/grpc_rest.rb

@@ -5,6 +5,9 @@ require 'grpc'
 require 'grpc/core/status_codes'
 
 module GrpcRest
+
+  GrpcRestCall = Struct.new(:metadata)
+
   class << self
     attr_accessor :strict_mode
 
@@ -180,7 +183,11 @@ module GrpcRest
     end
 
     def error_msg(error)
-      Rails.logger.error("#{error.message}, backtrace: #{error.backtrace.join("\n")}")
+      error_info = "#{error.message}, backtrace: #{error.backtrace.join("\n")}"
+      if error.respond_to?(:cause) && error.cause
+        error_info += "\n\nCaused by: " + error.cause.backtrace.join("\n")
+      end
+      Rails.logger.error(error_info)
       if error.respond_to?(:code)
         {
           code: error.code,
@@ -204,21 +211,29 @@ module GrpcRest
       end
     end
 
-    def send_gruf_request(klass, service_obj, method, request)
+    def send_gruf_request(klass, service_obj, method, request, headers: {})
       ref = service_obj.rpc_descs[method.classify.to_sym]
+      call = GrpcRestCall.new(headers)
       handler = klass.new(
         method_key: method.to_sym,
         service: service_obj,
         rpc_desc: ref,
-        active_call: nil,
+        active_call: GrpcRestCall.new(headers),
+        message: request
+      )
+      controller_request = Gruf::Controllers::Request.new(
+        method_key: method.to_sym,
+        service: service_obj,
+        rpc_desc: ref,
+        active_call: call,
         message: request
       )
-      Gruf::Interceptors::Context.new(gruf_interceptors(request)).intercept! do
+      Gruf::Interceptors::Context.new(gruf_interceptors(controller_request)).intercept! do
         handler.send(method.to_sym)
       end
     end
 
-    # @param request [Google::Protobuf::AbstractMessage]
+    # @param request [Gruf::Controllers::Request]
     # @return [Array<Gruf::Interceptors::Base>]
     def gruf_interceptors(request)
       error = Gruf::Error.new
@@ -232,19 +247,19 @@ module GrpcRest
       klass.new.public_send(method, request)
     end
 
-    def get_response(service, method, request)
+    def get_response(service, method, request, headers: {})
       if defined?(Gruf)
         service_obj = service.constantize::Service
         klass = ::Gruf::Controllers::Base.subclasses.find do |k|
           k.bound_service == service_obj
         end
-        return send_gruf_request(klass, service_obj, method, request) if klass
+        return send_gruf_request(klass, service_obj, method, request, headers: headers) if klass
       end
       send_grpc_request(service, method, request)
     end
 
-    def send_request(service, method, request, options = {})
-      response = get_response(service, method, request)
+    def send_request(service, method, request, options = {}, headers: {})
+      response = get_response(service, method, request, headers: headers)
       if options[:emit_defaults]
         response.to_json(emit_defaults: true)
       else

data/spec/__snapshots__/service.snap

@@ -29,7 +29,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test"], "", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request, {:emit_defaults=>true})
+    render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request, {:emit_defaults=>true}, headers: request.headers)
   end
 
 	def test2
@@ -37,7 +37,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test2"], "second_record", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test2", grpc_request, {})
+    render json: GrpcRest.send_request("Testdata::MyService", "test2", grpc_request, {}, headers: request.headers)
   end
 
 	def test3
@@ -45,7 +45,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test3"], "", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test3", grpc_request, {})
+    render json: GrpcRest.send_request("Testdata::MyService", "test3", grpc_request, {}, headers: request.headers)
   end
 
 	def test4
@@ -53,7 +53,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test4"], "*", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test4", grpc_request, {})
+    render json: GrpcRest.send_request("Testdata::MyService", "test4", grpc_request, {}, headers: request.headers)
   end
 
 end

data/spec/testdata/base/app/controllers/my_service_controller.rb

@@ -28,7 +28,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test"], "", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request, {:emit_defaults=>true})
+    render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request, {:emit_defaults=>true}, headers: request.headers)
   end
 
 	def test2
@@ -36,7 +36,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test2"], "second_record", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test2", grpc_request, {})
+    render json: GrpcRest.send_request("Testdata::MyService", "test2", grpc_request, {}, headers: request.headers)
   end
 
 	def test3
@@ -44,7 +44,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test3"], "", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test3", grpc_request, {})
+    render json: GrpcRest.send_request("Testdata::MyService", "test3", grpc_request, {}, headers: request.headers)
   end
 
 	def test4
@@ -52,7 +52,7 @@ class MyServiceController < ActionController::Base
       except(*%w(controller action my_service))
     grpc_request = GrpcRest.init_request(Testdata::TestRequest, parameters)
     GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test4"], "*", request.parameters)
-    render json: GrpcRest.send_request("Testdata::MyService", "test4", grpc_request, {})
+    render json: GrpcRest.send_request("Testdata::MyService", "test4", grpc_request, {}, headers: request.headers)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc-rest
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-11 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf