make payload Data.Aeson.Value

Author: banacorn

Web/SocketIO/Event.hs

@@ -10,12 +10,13 @@ import Web.SocketIO.Types
 --------------------------------------------------------------------------------
 import              Control.Applicative ((<$>))
 import              Control.Monad.Reader
+import qualified    Data.Aeson                          as Aeson
 import qualified    Data.ByteString.Lazy                as BL
 
 {-# DEPRECATED reply "use msg instead" #-}
 --------------------------------------------------------------------------------
 -- | This function is deprecated; use 'msg' instead
-reply :: CallbackM [Text]
+reply :: CallbackM [Aeson.Value]
 reply = do
     Payload p <- callbackEnvPayload <$> ask
     return p
@@ -29,7 +30,7 @@ reply = do
 --     liftIO $ print payload
 --     emit "echo" payload 
 -- @
-msg :: CallbackM [Text]
+msg :: CallbackM [Aeson.Value]
 msg = do
     Payload p <- callbackEnvPayload <$> ask
     return p

Web/SocketIO/Session.hs

@@ -30,10 +30,10 @@ handleSession SessionHandshake = do
                 heartbeatTimeout'
                 (closeTimeout configuration)
                 (transports configuration)
-    
 
 handleSession SessionConnect = do
-    logWithSession Info $ "Connected"
+    debugSession Info $ "Connected"
+    triggerEvent (Event "connection" (Payload []))
     return $ MsgConnect NoEndpoint
 
 handleSession SessionPolling = do

Web/SocketIO/Types/Base.hs

@@ -19,6 +19,7 @@ import              Control.Concurrent.Chan.Lifted
 import              Control.Monad.Reader       
 import              Control.Monad.Writer
 import              Control.Monad.Base
+import qualified    Data.Aeson                              as Aeson
 import qualified    Data.HashMap.Strict                     as H
 import              Data.IORef.Lifted
 import              Network.HTTP.Types.Header               (ResponseHeaders)
@@ -153,7 +154,7 @@ class Publisher m where
     -- `emit` \"launch\" [\"missile\", \"nuke\"] 
     -- @
     emit    :: EventName            -- ^ name of event to trigger
-            -> [Text]               -- ^ payload to carry with
+            -> [Aeson.Value]        -- ^ payload to carry with
             -> m ()
 
     -- | Sends a message to everybody except for the socket that starts it.
@@ -162,7 +163,7 @@ class Publisher m where
     -- `broadcast` \"hide\" [\"nukes coming!\"] 
     -- @
     broadcast   :: EventName        -- ^ name of event to trigger
-                -> [Text]           -- ^ payload to carry with
+                -> [Aeson.Value]    -- ^ payload to carry with
                 -> m ()
 
     -- | 

Web/SocketIO/Types/Event.hs

@@ -18,10 +18,7 @@ import              Web.SocketIO.Types.String
 
 ----------------------------------------------------------------------------------
 import              Control.Applicative
-import              Data.Aeson                              
-import              Data.Aeson.Encode               (encodeToTextBuilder)
-import              Data.List                       (intersperse)                              
-import              Data.Text.Internal.Builder      (toLazyText)
+import              Data.Aeson                      as Aeson
 import qualified    Data.Text.Lazy                  as TL
 import              Data.Vector                     (toList)
 --------------------------------------------------------------------------------
@@ -30,10 +27,10 @@ type EventName = Text
 
 --------------------------------------------------------------------------------
 -- | Payload carried by an Event
-data Payload = Payload [Text] deriving (Eq, Show)
+data Payload = Payload [Aeson.Value] deriving (Eq, Show)
 
 instance Serializable Payload where
-    serialize (Payload payload) = serialize $ '[' `TL.cons` (TL.concat $ intersperse "," payload) `TL.snoc` ']'
+    serialize (Payload payload) = serialize $ Aeson.encode payload
 
 --------------------------------------------------------------------------------
 -- | Event
@@ -52,7 +49,7 @@ instance FromJSON Event where
                           (toArgumentList <$> v .:? "args")
         where   toArgumentList :: Maybe Value -> Payload
                 toArgumentList Nothing          = Payload []
-                toArgumentList (Just (Array a)) = Payload $ filter (/= "null") . map (toLazyText . encodeToTextBuilder) . toList $ a
+                toArgumentList (Just (Array a)) = Payload $ filter (/= Aeson.Null) . toList $ a
                 toArgumentList _                = Payload []
 
    parseJSON _ = return NoEvent

Web/SocketIO/Types/String.hs

@@ -19,6 +19,7 @@ module Web.SocketIO.Types.String (
 
 
 --------------------------------------------------------------------------------
+import qualified    Data.Aeson                              as Aeson
 import qualified    Data.String                             as S
 import qualified    Data.Text                               as T
 import qualified    Data.Text.Encoding                      as TE
@@ -155,6 +156,9 @@ class Serializable a where
                  , Show a) => a -> s
     serialize = S.fromString . show
 
+instance Serializable Aeson.Value where
+    serialize = fromLazyByteString . Aeson.encode
+
 instance Serializable T.Text where
     serialize = fromText
 
@@ -163,7 +167,7 @@ instance Serializable TL.Text where
 
 instance Serializable ByteString where
     serialize = fromByteString
-    
+
 instance Serializable BL.ByteString where
     serialize = fromLazyByteString