diff --git a/Network/Wai/Handler/Launch.hs b/Network/Wai/Handler/Launch.hs --- a/Network/Wai/Handler/Launch.hs +++ b/Network/Wai/Handler/Launch.hs @@ -11,19 +11,19 @@ import Network.HTTP.Types import qualified Network.Wai.Handler.Warp as Warp import Data.IORef -import Control.Concurrent +import Control.Concurrent (forkIO, threadDelay) import Control.Monad.IO.Class (liftIO) import qualified Data.ByteString as S import Blaze.ByteString.Builder (fromByteString) #if WINDOWS import Foreign -import Foreign.C.String +import Foreign.String #else import System.Cmd (rawSystem) #endif import Data.Conduit.Zlib (decompressFlush, WindowBits (WindowBits)) import Data.Conduit.Blaze (builderToByteStringFlush) -import qualified Data.Conduit as C +import Data.Conduit import qualified Data.Conduit.List as CL ping :: IORef Bool -> Middleware @@ -50,42 +50,45 @@ let headers'' = filter (\(x, _) -> x /= "content-length") headers' let fixEnc src = if isEnc then - src C.$= decompressFlush (WindowBits 31) + src $= decompressFlush (WindowBits 31) else src return $ ResponseSource s headers'' - $ fixEnc (body C.$= builderToByteStringFlush) - C.$= insideHead - C.$= CL.map (fmap fromByteString) + $ fixEnc (body $= builderToByteStringFlush) + $= insideHead + $= CL.map (fmap fromByteString) toInsert :: S.ByteString toInsert = "" -insideHead :: C.Conduit (C.Flush S.ByteString) (C.ResourceT IO) (C.Flush S.ByteString) +insideHead :: Pipe l (Flush S.ByteString) (Flush S.ByteString) r (ResourceT IO) r insideHead = - C.conduitState (Just (S.empty, whole)) push' close + loop' (S.empty, whole) where + loop' state = awaitE >>= either (close state) (push' state) whole = "" - push' state (C.Chunk x) = (fmap . fmap) C.Chunk (push state x) - push' state C.Flush = return $ C.StateProducing state [C.Flush] - push (Just (held, atFront)) x + push' state (Chunk x) = push state x + push' state Flush = yield Flush >> loop' state + + push (held, atFront) x | atFront `S.isPrefixOf` x = do let y = S.drop (S.length atFront) x - return $ C.StateProducing Nothing [held, atFront, toInsert, y] + mapM_ (yield . Chunk) [held, atFront, toInsert, y] + CL.map id | whole `S.isInfixOf` x = do let (before, rest) = S.breakSubstring whole x let after = S.drop (S.length whole) rest - return $ C.StateProducing Nothing [held, before, whole, toInsert, after] + mapM_ (yield . Chunk) [held, before, whole, toInsert, after] + CL.map id | x `S.isPrefixOf` atFront = do let held' = held `S.append` x atFront' = S.drop (S.length x) atFront - return $ C.StateProducing (Just (held', atFront')) [] + loop' (held', atFront') | otherwise = do let (held', atFront', x') = getOverlap whole x - return $ C.StateProducing (Just (held', atFront')) [held, x'] - push Nothing x = return $ C.StateProducing Nothing [x] + mapM_ (yield . Chunk) [held, x'] + loop' (held', atFront') - close (Just (held, _)) = return [C.Chunk held, C.Chunk toInsert] - close Nothing = return [] + close (held, _) r = mapM_ yield [Chunk held, Chunk toInsert] >> return r getOverlap :: S.ByteString -> S.ByteString -> (S.ByteString, S.ByteString, S.ByteString) getOverlap whole x = diff --git a/wai-handler-launch.cabal b/wai-handler-launch.cabal --- a/wai-handler-launch.cabal +++ b/wai-handler-launch.cabal @@ -1,5 +1,5 @@ Name: wai-handler-launch -Version: 1.2.0.2 +Version: 1.3.0 Synopsis: Launch a web app in the default browser. Description: This handles cross-platform launching and inserts Javascript code to ping the server. When the server no longer receives pings, it shuts down. License: MIT @@ -13,15 +13,15 @@ Library Exposed-modules: Network.Wai.Handler.Launch build-depends: base >= 4 && < 5 - , wai >= 1.2 && < 1.3 - , warp >= 1.2 && < 1.3 - , http-types >= 0.6 && < 0.7 + , wai >= 1.3 && < 1.4 + , warp >= 1.3 && < 1.4 + , http-types >= 0.7 && < 0.8 , transformers >= 0.2.2 && < 0.4 , bytestring >= 0.9.1.4 , blaze-builder >= 0.2.1.4 && < 0.4 - , conduit >= 0.4 && < 0.5 - , blaze-builder-conduit >= 0.4 && < 0.5 - , zlib-conduit >= 0.4 && < 0.5 + , conduit >= 0.5 && < 0.6 + , blaze-builder-conduit >= 0.5 && < 0.6 + , zlib-conduit >= 0.5 && < 0.6 if os(windows) c-sources: windows.c