Serialization, refactoring...

2 files changed, 20 insertions, 1 deletions

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