4 files changed, 31 insertions, 12 deletions

diff --git a/Codec/LineReady.hs b/Codec/LineReady.hs
index ca2cde3..a6961ca 100644
--- a/Codec/LineReady.hs
+++ b/Codec/LineReady.hs
@@ -10,7 +10,7 @@ toLineReady blob =
     let as = zip [0..] (B.unpack blob) 
         bs = filter ((=='\n') . snd) as
         is = map fst bs 
-        in B.pack (show is) <> foldl' (replaceCharStrIndex '#') blob is <> B.singleton '\n'
+        in B.pack (show is) <> foldl' (replaceCharStrIndex '#') blob is 
 
 replaceCharStrIndex :: Char -> B.ByteString -> Int -> B.ByteString
 replaceCharStrIndex c str i = a <> B.singleton c <> B.drop 1 b 
@@ -20,4 +20,4 @@ fromLineReady :: B.ByteString -> B.ByteString
 fromLineReady str = foldl' (replaceCharStrIndex '\n') (B.drop 1 str') is
         where is = map fst . mapMaybe B.readInt $ 
                         B.groupBy (\c d -> (c/=',')&&(d/=',')) ls
-              (ls,str') = B.break (==']') (B.tail str)
+              (ls,str') = B.break (==']') (B.drop 1 str)
diff --git a/KikiD/ClientState.hs b/KikiD/ClientState.hs
new file mode 100644
index 0000000..a80a392
--- /dev/null
+++ b/KikiD/ClientState.hs
@@ -0,0 +1,14 @@
+module KikiD.ClientState where
+
+import KikiD.Message
+import Control.Concurrent.STM.TBMQueue
+import Control.Concurrent
+
+data ClientState = CState {cliQueue :: TBMQueue KikiDMessage}
+
+mkClient = CState 
+            { cliQueue = error "ERROR CState: cliQueue parameter is required"
+            }
+
+type ClientID = ThreadId 
+threadIdToClient = id
diff --git a/KikiD/Message.hs b/KikiD/Message.hs
index cd3ee71..efefdc6 100644
--- a/KikiD/Message.hs
+++ b/KikiD/Message.hs
@@ -12,6 +12,7 @@ import Data.Bytes.Put as Put
 import Data.Bytes.Get as Get
 import Codec.LineReady
 import Control.Monad.Loops
+import Data.Word
 
 data KikiDMessage = TODO deriving (Show,Read)
 
@@ -31,7 +32,11 @@ instance Serialize KikiDMessage where
 instance Serial KikiDMessage where
     serialize m = Put.putByteString . toLineReady . Cereal.encode $ m
     deserialize = do 
-        xs <- unfoldWhileM (/= '\n') (fmap (chr . fromIntegral) Get.getWord8)
+        xs <- unfoldM $ do
+            flag <- Get.isEmpty
+            if flag then return Nothing else do
+                c <- fmap (chr . fromIntegral) Get.getWord8
+                if (c == '\n') then return Nothing else return (Just c)
         case (Cereal.decode . fromLineReady $ B.pack xs) of
             Left str -> fail str
             Right x  -> return x
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)