wip: allow setting a custom path

domenkozar · Feb 12, 2024 · ced287c · ced287c
1 parent f9a07c0
commit ced287c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/src/Network/GRPC/Client/Connection.hs b/src/Network/GRPC/Client/Connection.hs
@@ -359,6 +359,7 @@ startRPC Connection{connMetaVar, connParams, connStateVar} _ callParams = do
               ]
         , requestMetadata =
             callRequestMetadata callParams
+        , requestPath = callPath callParams
         , requestCompression =
             compressionId <$> cOut
         , requestAcceptCompression = Just $

diff --git a/src/Network/GRPC/Client/Session.hs b/src/Network/GRPC/Client/Session.hs
@@ -103,13 +103,18 @@ instance IsRPC rpc => InitiateSession (ClientSession rpc) where
         (fmap getTrailersOnly . parseTrailersOnly (Proxy @rpc))
         (responseHeaders info)
 
-  buildRequestInfo _ start = RequestInfo {
+  buildRequestInfo _ start = 
+      let 
+        rp = case start of 
+          FlowStartRegular headers -> Network.GRPC.Spec.requestPath (outHeaders headers)
+          FlowStartNoMessages _ -> Nothing
+      in RequestInfo {
         requestMethod  = rawMethod resourceHeaders
-      , requestPath    = rawPath resourceHeaders
+      , requestPath    = maybe (rawPath resourceHeaders) id rp
       , requestHeaders = buildRequestHeaders (Proxy @rpc) $
             case start of
               FlowStartRegular    headers -> outHeaders headers
-              FlowStartNoMessages headers ->            headers
+              FlowStartNoMessages noMsgs ->            noMsgs
       }
     where
       resourceHeaders :: RawResourceHeaders

diff --git a/src/Network/GRPC/Spec/Call.hs b/src/Network/GRPC/Spec/Call.hs
@@ -4,10 +4,12 @@ module Network.GRPC.Spec.Call (
   ) where
 
 import Data.Default
+import Data.ByteString qualified as Strict
 
 import Network.GRPC.Spec.CustomMetadata
 import Network.GRPC.Spec.Timeout
 
+
 {-------------------------------------------------------------------------------
   Parameteres
 -------------------------------------------------------------------------------}
@@ -27,6 +29,7 @@ data CallParams = CallParams {
       -- its own metadata in the response: see 'responseMetadata' and
       -- 'trailerMetadatda'.)
     , callRequestMetadata :: [CustomMetadata]
+    , callPath :: Maybe Strict.ByteString
     }
   deriving stock (Show, Eq)
 
@@ -35,5 +38,6 @@ instance Default CallParams where
   def = CallParams {
         callTimeout         = Nothing
       , callRequestMetadata = []
+      , callPath = Nothing
       }
 
diff --git a/src/Network/GRPC/Spec/Request.hs b/src/Network/GRPC/Spec/Request.hs
@@ -55,6 +55,8 @@ data RequestHeaders = RequestHeaders {
       -- | Compression used for outgoing messages
     , requestCompression :: Maybe CompressionId
 
+    , requestPath :: Maybe Strict.ByteString
+
       -- | Accepted compression algorithms for incoming messages
       --
       -- @Maybe (NonEmpty ..)@ is perhaps a bit strange (why not just @[]@), but
@@ -272,6 +274,7 @@ parseRequestHeaders proxy =
            Right (Nothing :: Maybe Timeout)
         :* Right ([]      :: [CustomMetadata])
         :* Right (Nothing :: Maybe CompressionId)
+        :* Right (Nothing :: Maybe Strict.ByteString)
         :* Right (Nothing :: Maybe (NonEmpty CompressionId))
         :* Right (Nothing :: Maybe Strict.ByteString)
         :* Right (Nothing :: Maybe TraceContext)
@@ -280,6 +283,7 @@ parseRequestHeaders proxy =
     (    _updTimeout
       :* updCustom
       :* updCompression
+      :* updPath
       :* updAcceptCompression
       :* _updOverrideContentType
       :* updTraceContext