Serialization, refactoring...

1 files changed, 9 insertions, 9 deletions

diff --git a/kikid.hs b/kikid.hs
index 04e06d3..059a5df 100644
--- a/kikid.hs
+++ b/kikid.hs
@@ -1,13 +1,12 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DoAndIfThenElse #-}
 
 import System.Posix.Daemonize
 import Control.Concurrent
 import System.Posix.Syslog
 import System.Posix.Signals
 import System.Posix.User (getEffectiveUserID)
-import KikiD.PortServer
-import KikiD.Multiplex
-import KikiD.Message
+
 import Control.Concurrent.STM
 import Control.Concurrent.STM.TBMQueue
 import Control.Concurrent.Async
@@ -20,7 +19,12 @@ import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as M
 import qualified Data.Bytes.Serial as Bytes
 import qualified Data.Bytes.Get as Bytes
---import qualified Data.Bytes.Put as Bytes
+import qualified Data.Bytes.Put as Bytes
+
+import KikiD.PortServer
+import KikiD.Multiplex
+import KikiD.Message
+import KikiD.ClientState
 
 -- TODO: Set this in config file
 port = 9800
@@ -67,10 +71,6 @@ kikidMain _ = do
         atomically $ closeTBMQueue newchans
         atomically $ closeTBMQueue incomming
 
-data ClientState = CState {csQueue :: TBMQueue KikiDMessage}
-type ClientID = ThreadId 
-threadIdToClient = id
-
 addOpenConnections newchans currentClients = whileM_ (atomically . fmap not $ isClosedTBMQueue newchans) $ do
     cliMap <- atomically $ readTVar currentClients :: IO (M.Map ClientID ClientState)
     whileM_ (atomically . fmap not $ isEmptyTBMQueue newchans) $ do
@@ -99,7 +99,7 @@ purgeClosedConnections quit currentClients = whileM_ (fmap not quit) $ do
 handleMessage hdl outq = do 
     line <- B.hGetLine hdl
     tid <- myThreadId
-    case (Bytes.runGetS Bytes.deserialize (B.snoc line '\n')   :: Either String KikiDMessage) of
+    case (Bytes.runGetS Bytes.deserialize line :: Either String KikiDMessage) of
         Right msg -> do
             syslog Notice ("Message decoded on thread=" <> show tid)
             syslog Notice ("Message: " <> show msg)