Show ws events

Author: easafe

src/Client/Im/WebSocket/Events.purs

@@ -23,6 +23,7 @@ import Data.Tuple.Nested ((/\))
 import Debug (spy)
 import Effect (Effect)
 import Effect.Class (liftEffect)
+import Effect.Console as EC
 import Effect.Now as EN
 import Effect.Random as ERD
 import Effect.Ref (Ref)
@@ -46,7 +47,7 @@ import Shared.Unsafe ((!@))
 import Shared.Unsafe as SU
 import Web.Event.EventTarget as WET
 import Web.Event.Internal.Types (Event)
-import Web.Socket.Event.EventTypes (onMessage, onOpen, onClose)
+import Web.Socket.Event.EventTypes (onClose, onError, onMessage, onOpen)
 import Web.Socket.Event.MessageEvent as WSEM
 import Web.Socket.WebSocket (WebSocket)
 import Web.Socket.WebSocket as WSW
@@ -78,10 +79,12 @@ setUpWebsocket webSocketStateRef = do
       openListener ← WET.eventListener (handleOpen webSocketStateRef)
       messageListener ← WET.eventListener (handleMessage webSocketStateRef)
       closeListener ← WET.eventListener (handleClose webSocketStateRef)
+      errorListener ← WET.eventListener (handleError webSocketStateRef)
 
       WET.addEventListener onMessage messageListener false webSocketTarget
       WET.addEventListener onOpen openListener false webSocketTarget
       WET.addEventListener onClose closeListener false webSocketTarget
+      WET.addEventListener onError errorListener false webSocketTarget
 
 handleOpen ∷ Ref WebSocketState → Event → Effect Unit
 handleOpen webSocketStateRef _ = do
@@ -125,7 +128,8 @@ handleMessage webSocketStateRef event = do
 
 -- | Clear intervals and set up new web socket connection after a random timeout
 handleClose ∷ Ref WebSocketState → Event → Effect Unit
-handleClose webSocketStateRef _ = do
+handleClose webSocketStateRef event = do
+      let e = spy "ev close" event
       state ← ER.read webSocketStateRef
       FS.send imId $ ToggleConnected false
 
@@ -142,6 +146,11 @@ handleClose webSocketStateRef _ = do
                   setUpWebsocket webSocketStateRef
             ER.modify_ (_ { reconnectId = Just id }) webSocketStateRef
 
+handleError ∷ Ref WebSocketState → Event → Effect Unit
+handleError webSocketStateRef event = do
+      let e = spy "ev" event
+      EC.log "errored"
+
 -- | Send ping with users to learn availability of
 sendPing ∷ WebSocket → Boolean → ImModel → NoMessages
 sendPing webSocket isActive model =

src/Server/WebSocket/Events.purs

@@ -1,10 +1,6 @@
 module Server.WebSocket.Events where
 
 import Prelude
-import Server.Effect (BaseEffect, BaseReader, Configuration)
-import Shared.Availability (Availability(..))
-import Shared.Im.Types (AfterLogout(..), FullWebSocketPayloadClient(..), MessageError(..), MessageStatus, OutgoingRecord, WebSocketPayloadClient(..), WebSocketPayloadServer(..))
-import Shared.User (ProfileVisibility(..))
 
 import Browser.Cookies.Internal as BCI
 import Data.Array as DA
@@ -24,6 +20,7 @@ import Data.Newtype as DN
 import Data.Time.Duration (Hours)
 import Data.Tuple (Tuple(..))
 import Data.Tuple as DT
+import Debug (spy)
 import Droplet.Driver (Pool)
 import Effect (Effect)
 import Effect.Aff as EA
@@ -44,19 +41,23 @@ import Server.Cookies (cookieName)
 import Server.Database.KarmaLeaderboard as SIKL
 import Server.Database.Privileges as SIP
 import Server.Database.Users as SBU
+import Server.Effect (BaseEffect, BaseReader, Configuration)
 import Server.Effect as SE
 import Server.Im.Action as SIA
 import Server.Im.Database as SID
 import Server.Settings.Action as SSA
 import Server.Token as ST
 import Server.WebSocket (CloseCode, CloseReason, WebSocketConnection, WebSocketMessage(..))
 import Server.WebSocket as SW
+import Shared.Availability (Availability(..))
 import Shared.DateTime (DateTimeWrapper(..))
 import Shared.DateTime as SDT
+import Shared.Im.Types (AfterLogout(..), FullWebSocketPayloadClient(..), MessageError(..), MessageStatus, OutgoingRecord, WebSocketPayloadClient(..), WebSocketPayloadServer(..))
 import Shared.Json as SJ
 import Shared.Resource (updateHash)
 import Shared.ResponseError (DatabaseError, ResponseError(..))
 import Shared.Unsafe as SU
+import Shared.User (ProfileVisibility(..))
 import Simple.JSON (class WriteForeign)
 import Simple.JSON as SJS
 
@@ -99,11 +100,12 @@ inactiveHours = 1
 
 handleConnection ∷ Configuration → Pool → Ref (HashMap Int UserAvailability) → WebSocketConnection → Request → Effect Unit
 handleConnection configuration pool allUsersAvailabilityRef connection request = EA.launchAff_ do
+      liftEffect $ EC.log "sockets"
       maybeUserId ← SE.poolEffect pool do
             userId ← parseUserId
             isIt ← DM.maybe (pure false) SBU.isUserBanned userId
             pure $ if isIt then Nothing else userId
-      liftEffect $ case maybeUserId of
+      liftEffect $ case (spy "maybe user" maybeUserId) of
             Nothing → do
                   --this can be made more clear for the end user
                   sendWebSocketMessage connection $ CloseConnection LoginPage