From f520e47aa8d5c5ef54fcd1a019948d2c5cd7b821 Mon Sep 17 00:00:00 2001
From: Kazu Yamamoto <kazu@iij.ad.jp>
Date: Wed, 7 Aug 2024 10:39:31 +0900
Subject: [PATCH] removing unnecessary API from ServerIO

---
 Network/HTTP2/Server/Run.hs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Network/HTTP2/Server/Run.hs b/Network/HTTP2/Server/Run.hs
index cb099fad..2a35fe39 100644
--- a/Network/HTTP2/Server/Run.hs
+++ b/Network/HTTP2/Server/Run.hs
@@ -56,15 +56,13 @@ run sconf conf server = do
 
 ----------------------------------------------------------------
 
-data ServerIO = ServerIO
+data ServerIO a = ServerIO
     { sioMySockAddr :: SockAddr
     , sioPeerSockAddr :: SockAddr
-    , sioReadRequest :: IO (StreamId, Stream, Request)
-    , sioWriteResponse :: Stream -> Response -> IO ()
+    , sioReadRequest :: IO (a, Request)
+    , sioWriteResponse :: a -> Response -> IO ()
     -- ^ 'Response' MUST be created with 'responseBuilder'.
     -- Others are not supported.
-    , sioWriteBytes :: ByteString -> IO ()
-    -- ^ Writing raw bytes including a frame header.
     }
 
 -- | Launching a receiver and a sender without workers.
@@ -72,7 +70,7 @@ data ServerIO = ServerIO
 runIO
     :: ServerConfig
     -> Config
-    -> (ServerIO -> IO (IO ()))
+    -> (ServerIO Stream -> IO (IO ()))
     -> IO ()
 runIO sconf conf@Config{..} action = do
     ok <- checkPreface conf
@@ -82,7 +80,7 @@ runIO sconf conf@Config{..} action = do
         ctx@Context{..} <- setup sconf conf lnch
         let get = do
                 (strm, inpObj) <- atomically $ readTQueue inpQ
-                return (streamNumber strm, strm, Request inpObj)
+                return (strm, Request inpObj)
             putR strm (Response OutObj{..}) = do
                 case outObjBody of
                     OutBodyBuilder builder -> do
@@ -91,14 +89,12 @@ runIO sconf conf@Config{..} action = do
                             out = OHeader outObjHeaders (Just next) outObjTrailers
                         enqueueOutput outputQ $ Output strm out sync
                     _ -> error "Response other than OutBodyBuilder is not supported"
-            putB bs = enqueueControl controlQ $ CFrames Nothing [bs]
             serverIO =
                 ServerIO
                     { sioMySockAddr = confMySockAddr
                     , sioPeerSockAddr = confPeerSockAddr
                     , sioReadRequest = get
                     , sioWriteResponse = putR
-                    , sioWriteBytes = putB
                     }
         io <- action serverIO
         concurrently_ io $ runH2 conf ctx