Move Call also into .Call

This should have been part of #199.
well-typed · Jul 24, 2024 · 379fc0b · 379fc0b
1 parent 4a04a91
commit 379fc0b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/src/Network/GRPC/Client/Call.hs b/src/Network/GRPC/Client/Call.hs
@@ -5,7 +5,8 @@
 -- Intended for unqualified import.
 module Network.GRPC.Client.Call (
     -- * Construction
-    withRPC
+    Call -- opaque
+  , withRPC
 
     -- * Open (ongoing) call
   , sendInput
@@ -46,7 +47,7 @@ import Data.Text qualified as Text
 import Data.Version
 import GHC.Stack
 
-import Network.GRPC.Client.Connection (Connection, ConnParams, Call(..))
+import Network.GRPC.Client.Connection (Connection, ConnParams(..))
 import Network.GRPC.Client.Connection qualified as Connection
 import Network.GRPC.Client.Session
 import Network.GRPC.Common
@@ -64,6 +65,13 @@ import Paths_grapesy qualified as Grapesy
   Open a call
 -------------------------------------------------------------------------------}
 
+-- | State of the call
+--
+-- This type is kept abstract (opaque) in the public facing API.
+data Call rpc = SupportsClientRpc rpc => Call {
+      callChannel :: Session.Channel (ClientSession rpc)
+    }
+
 -- | Scoped RPC call
 --
 -- Typical usage:
@@ -72,7 +80,7 @@ import Paths_grapesy qualified as Grapesy
 -- >   .. use 'call' to send and receive messages
 --
 -- for some previously established connection 'conn'
--- (see 'Network.GRPC.Client.withConnection') and where @ListFeatures@ is some
+-- (see 'Network.GRPC.Client.withConnection) and where @ListFeatures@ is some
 -- kind of RPC.
 --
 -- The call is setup in the background, and might not yet have been established
@@ -197,7 +205,7 @@ startRPC conn _ callParams = do
 
     channel <-
       Session.setupRequestChannel
-        callSession
+        session
         connToServer
         serverClosedConnection
         flowStart
@@ -225,7 +233,7 @@ startRPC conn _ callParams = do
           _mAlreadyClosed <- Session.close channel exitReason
           return ()
 
-    return $ Call callSession channel
+    return $ Call channel
   where
     connParams :: ConnParams
     connParams = Connection.connParams conn
@@ -235,16 +243,16 @@ startRPC conn _ callParams = do
           requestTimeout =
             asum [
                 callTimeout callParams
-              , Connection.connDefaultTimeout connParams
+              , connDefaultTimeout connParams
               ]
         , requestMetadata =
             customMetadataMapFromList metadata
         , requestCompression =
             compressionId <$> cOut
         , requestAcceptCompression = Just $
-            Compression.offer $ Connection.connCompression connParams
+            Compression.offer $ connCompression connParams
         , requestContentType =
-            Connection.connContentType connParams
+            connContentType connParams
         , requestMessageType =
             Just MessageTypeDefault
         , requestUserAgent = Just $
@@ -264,9 +272,9 @@ startRPC conn _ callParams = do
             ()
         }
 
-    callSession :: ClientSession rpc
-    callSession = ClientSession {
-          clientCompression = Connection.connCompression connParams
+    session :: ClientSession rpc
+    session = ClientSession {
+          clientCompression = connCompression connParams
         , clientUpdateMeta  = Connection.updateConnectionMeta conn
         }
 

diff --git a/src/Network/GRPC/Client/Connection.hs b/src/Network/GRPC/Client/Connection.hs
@@ -9,7 +9,6 @@
 module Network.GRPC.Client.Connection (
     -- * Definition
     Connection -- opaque
-  , Call(..)
   , withConnection
     -- * Configuration
   , Server(..)
@@ -41,7 +40,6 @@ import System.Random
 
 import Network.GRPC.Client.Meta (Meta)
 import Network.GRPC.Client.Meta qualified as Meta
-import Network.GRPC.Client.Session
 import Network.GRPC.Common.Compression qualified as Compr
 import Network.GRPC.Common.HTTP2Settings
 import Network.GRPC.Spec
@@ -81,14 +79,6 @@ data Connection = Connection {
     , connStateVar :: TVar ConnectionState
     }
 
--- | State of the call
---
--- This type is kept abstract (opaque) in the public facing API.
-data Call rpc = SupportsClientRpc rpc => Call {
-      callSession :: ClientSession rpc
-    , callChannel :: Session.Channel (ClientSession rpc)
-    }
-
 {-------------------------------------------------------------------------------
   Config
 -------------------------------------------------------------------------------}