1 files changed, 9 insertions, 46 deletions

diff --git a/fig-bus/src/Fig/Bus/Binary.hs b/fig-bus/src/Fig/Bus/Binary.hs
index 6329d01..5f465ec 100644
--- a/fig-bus/src/Fig/Bus/Binary.hs
+++ b/fig-bus/src/Fig/Bus/Binary.hs
@@ -5,19 +5,15 @@ import Fig.Prelude
 import Control.Monad (when)
 import Control.Concurrent.MVar as MVar
 
-import Data.Word (Word8, Word32)
-import Data.Bits ((.|.), (.&.), shiftL, shiftR)
 import qualified Data.List as List
-import Data.ByteString (hPut, hGet)
+import Data.ByteString (hGet)
 import qualified Data.ByteString as BS
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import qualified Data.IORef as IORef
 
 import Fig.Utils.Net
-
-newtype EventType = EventType ByteString
-  deriving (Show, Eq, Ord)
+import Fig.Bus.Binary.Utils
 
 newtype BusState = BusState
   { subscriptions :: Map EventType [Handle]
@@ -33,39 +29,6 @@ unsubscribe ev h bs = bs
   { subscriptions = Map.update (Just . List.delete h) ev bs.subscriptions
   }
 
-intFromLEBytes :: [Word8] -> Int
-intFromLEBytes [] = 0
-intFromLEBytes (x:xs) = shiftL (intFromLEBytes xs) 8 .|. fromIntegral x
-
-readLengthPrefixed :: Handle -> IO (Maybe ByteString)
-readLengthPrefixed h = do
-  n <- hGet h 4
-  log $ "parsing: " <> tshow n
-  case intFromLEBytes (BS.unpack n) of
-    0 -> pure Nothing
-    len -> do
-      log $ "reading: " <> tshow len
-      x <- hGet h len
-      pure $ Just x
-
-readEvent :: Handle -> IO (Maybe EventType)
-readEvent h = do
-  mb <- readLengthPrefixed h
-  pure $ EventType <$> mb
-
-writeLengthPrefixed :: Handle -> ByteString -> IO ()
-writeLengthPrefixed h d = do
-  let l :: Word32 = fromIntegral $ BS.length d
-  let bytes =
-        [ fromIntegral $ l .&. 0xff
-        , fromIntegral $ shiftR l 8 .&. 0xff
-        , fromIntegral $ shiftR l 16 .&. 0xff
-        , fromIntegral $ shiftR l 24 .&. 0xff
-        ]
-  hPut h $ BS.pack bytes <> d 
-
-writeEvent :: Handle -> EventType -> IO ()
-writeEvent h (EventType d) = writeLengthPrefixed h d
 
 publish :: EventType -> ByteString -> BusState -> IO ()
 publish ev d bs =
@@ -88,19 +51,19 @@ main bind = do
               when (BS.length c == 1) do
                 case BS.head c of
                   115 -> readEvent h >>= \case
-                    Just ev -> do
-                      log $ tshow peer <> " subscribing to: " <> tshow ev
+                    Just ev@(EventType e) -> do
+                      log $ tshow peer <> " subscribing to: " <> tshow e
                       IORef.modifyIORef' subs (ev:)
                       MVar.modifyMVar_ st (pure . subscribe ev h)
                       go
-                    _ -> log "malformed subscription"
+                    _else -> log "malformed subscription"
                   112 -> (,) <$> readEvent h <*> readLengthPrefixed h >>= \case
-                    (Just ev, Just d) -> do
-                      log $ tshow peer <> " publishing to: " <> tshow ev
+                    (Just ev@(EventType e), Just d) -> do
+                      log $ tshow peer <> " publishing to: " <> tshow e
                       publish ev d =<< MVar.readMVar st
                       go
-                    _ -> log "malformed publish"
-                  _ -> log "unknown"
+                    _else -> log "malformed publish"
+                  w -> log $ "unknown command code: " <> tshow w
           go
       , do
           ss <- IORef.readIORef subs