pushing new changes with examples

Author: Woody88

examples/Client.purs

@@ -0,0 +1,14 @@
+module Examples.Client where
+
+import Prelude
+
+import Effect (Effect)
+import Effect.Class.Console as Console
+import EventSource as ES
+
+main :: Effect Unit
+main = do 
+  es <- ES.createEventSource "http://localhost:3000" mempty
+
+  ES.onMessage es \me -> do 
+    Console.log me.data 

examples/Server.purs

@@ -0,0 +1,35 @@
+module Examples.Server where
+
+import Prelude
+
+import Control.Plus (empty)
+import Data.Maybe (Maybe(..))
+import Effect (Effect)
+import Effect.Class.Console as Console
+import Effect.Now as Effect
+import Effect.Timer (clearInterval, setInterval)
+import Node.HTTP as HTTP
+import Node.Stream as Stream
+import SSE as SSE
+import SSE.Types (EventName(..), ServerEvent(..))
+
+main :: Effect Unit
+main = do 
+  server <- HTTP.createServer \req res -> app req res 
+  HTTP.listen server { backlog: Nothing, hostname: "localhost",port: 3000 } do 
+    Console.log "listen on port 3000"
+  where 
+    app req res  = do 
+      Console.log "New connection"
+      let resStream = HTTP.responseAsStream res
+      sseStream <- SSE.createSseStream req
+      _ <- SSE.pipe sseStream resStream 
+    
+      intervalId <- setInterval 1000 do 
+        let event = Just $ EventName "message"
+        date <- Effect.nowDateTime 
+        void $ SSE.write sseStream $ ServerEvent { data: show date, event, id: empty }
+
+      Stream.onClose resStream do 
+        Console.log "lost connection"
+        clearInterval intervalId

package.json

@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/purescript-node-contrib/purescript-eventsource#readme",
   "dependencies": {
-    "eventsource": "^1.0.7"
+    "eventsource": "^1.0.7",
+    "ssestream": "^1.1.0"
   }
 }

packages.dhall

@@ -135,6 +135,18 @@ let additions =
     , version =
         "master"
     }
+  , sse-stream =
+    { dependencies =
+      [ "http-types"
+      , "node-http"
+      , "node-streams"
+      , "spec"
+      ]
+    , repo =
+        "https://github.com/purescript-node-contrib/purescript-sse-stream.git"
+    , version =
+        "master"
+    }
   }
 
-in  upstream // overrides // additions
+in  upstream // overrides // additions

spago.dhall

@@ -3,7 +3,15 @@ Welcome to a Spago project!
 You can edit this file as you like.
 -}
 { name = "my-project"
-, dependencies = [ "console", "effect", "http-types", "psci-support" ]
+, dependencies =
+  [ "console"
+  , "effect"
+  , "http-types"
+  , "js-timers"
+  , "options"
+  , "psci-support"
+  , "sse-stream"
+  ]
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs", "test/**/*.purs" ]
 }

src/EventSource.js

@@ -1,5 +1,7 @@
 "use strict"; 
 
+const EventSource = require('eventsource')
+
 exports._createEventSource = url => options => () => {
   options.https = { rejectUnauthorized:  options.httpsRejectUnauthorized }
   delete options.httpsRejectUnauthorized
@@ -26,7 +28,7 @@ exports._onOpen = evs => cb => () => {
 }
 
 exports._onMessage = evs => cb => () => {
-  evs.onmessage = cb 
+  evs.onmessage = (e) => cb(e)()
 }
 
 exports._onError = evs => closeError => evsError => cb => () => {

src/EventSource.purs

@@ -4,21 +4,35 @@ import Prelude
 
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
-import Data.Maybe (Maybe(..))
+import Data.Options (Option, Options, opt, options)
 import Effect (Effect)
+import Foreign (Foreign)
 import Network.HTTP.Types as H
-import Prim.Row (class Union)
 
 foreign import data EventSource :: Type 
 
+data ExtentionOptions 
+
+httpsRejectUnauthorized :: Option ExtentionOptions Boolean 
+httpsRejectUnauthorized = opt "httpsRejectUnauthorized"
+
+withCredentials :: Option ExtentionOptions Boolean 
+withCredentials = opt "withCredentials"
+
+headers :: Option ExtentionOptions (Array H.Header)
+headers = opt "headers"
+
+proxy :: Option ExtentionOptions String 
+proxy = opt "proxy"
+
 newtype EventName = EventName String 
 
-type Extensions = 
-  ( httpsRejectUnauthorized :: Boolean  
-  , withCredentials         :: Boolean 
-  , headers                 :: Array H.Header
-  , proxy                   :: String 
-  )
+type MessageEvent = 
+  { type        :: String 
+  , data        :: String 
+  , lastEventId :: String 
+  , origin      :: String 
+  }
 
 data EventSourceError 
   = EventSourceErr H.Status
@@ -35,13 +49,11 @@ derive instance eqReadyState :: Eq ReadyState
 instance showReadyState :: Show ReadyState where
   show = genericShow
 
-createEventSource :: forall exts t. 
-  Union exts t Extensions 
-  => String 
-  -> Maybe { | exts }
-  -> EventSource
-createEventSource url Nothing = _createEventSource url {}
-createEventSource url (Just exts) = _createEventSource url exts
+eventName :: String -> EventName 
+eventName = EventName 
+
+createEventSource :: String -> Options ExtentionOptions -> Effect EventSource
+createEventSource url opts = _createEventSource url $ options opts
 
 readyState :: EventSource -> Effect ReadyState
 readyState evs = do
@@ -51,28 +63,29 @@ readyState evs = do
     1 -> OPEN
     _ -> CLOSED
 
-addEventListener :: forall event. EventSource -> EventName -> (event -> Effect Unit) -> Effect Unit  
+addEventListener :: EventSource -> EventName -> (MessageEvent -> Effect Unit) -> Effect Unit  
 addEventListener evs (EventName en) = _addEventListener evs en
 
-removeEventListener :: forall event. EventSource -> EventName -> (event -> Effect Unit) -> Effect Unit  
+removeEventListener :: EventSource -> EventName -> Effect Unit -> Effect Unit  
 removeEventListener evs (EventName en) = _removeEventListener evs en
 
-onOpen :: forall event. EventSource -> (event -> Effect Unit) -> Effect Unit 
+onOpen :: EventSource -> Effect Unit -> Effect Unit 
 onOpen = _onOpen 
 
-onMessage :: forall event. EventSource -> (event -> Effect Unit) -> Effect Unit 
+-- | This will only fire if your event name is 'message', do not use it unless so.
+onMessage :: EventSource -> (MessageEvent -> Effect Unit) -> Effect Unit 
 onMessage = _onMessage 
 
 onError :: EventSource -> (EventSourceError -> Effect Unit) -> Effect Unit 
 onError evs = _onError evs ConnectionClosedErr EventSourceErr
 
-foreign import _createEventSource :: forall opts. String -> opts -> EventSource 
-foreign import _readyState :: EventSource -> Effect Int  
-foreign import _addEventListener :: forall event. EventSource -> String -> (event -> Effect Unit) -> Effect Unit 
-foreign import _removeEventListener :: forall event. EventSource -> String -> (event -> Effect Unit) -> Effect Unit 
+foreign import _createEventSource :: String -> Foreign -> Effect EventSource 
+foreign import _readyState :: EventSource -> Effect Int 
+foreign import _addEventListener :: EventSource -> String -> (MessageEvent -> Effect Unit) -> Effect Unit 
+foreign import _removeEventListener :: EventSource -> String -> Effect Unit -> Effect Unit 
 foreign import close :: EventSource -> Effect Unit  
-foreign import _onOpen :: forall event. EventSource -> (event -> Effect Unit) -> Effect Unit 
-foreign import _onMessage :: forall event. EventSource -> (event -> Effect Unit) -> Effect Unit 
+foreign import _onOpen :: EventSource -> Effect Unit -> Effect Unit 
+foreign import _onMessage :: EventSource -> (MessageEvent -> Effect Unit) -> Effect Unit
 foreign import _onError :: 
   EventSource 
   -> (String  -> EventSourceError)