Skip to content

Commit 514c240

Browse files
author
Charles Scalfani
committed
Send Errors will now return the message that it was trying to send
1 parent 92d5152 commit 514c240

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Test/Listener.elm

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type Msg
1616
| ConnectDisconnect ( WSPort, Path, ClientId, IPAddress, ConnectionStatus )
1717
| ListenError ( WSPort, Path, String )
1818
| WSMessage ( ClientId, QueryString, String )
19-
| SendError ( WSPort, ClientId, String )
19+
| SendError ( WSPort, ClientId, String, String )
2020
| Sent ( WSPort, ClientId, String )
2121

2222

@@ -56,10 +56,10 @@ update msg model =
5656
in
5757
model ! [ Websocket.send SendError Sent model.wsPort clientId message ]
5858

59-
SendError ( wsPort, clientId, error ) ->
59+
SendError ( wsPort, clientId, message, error ) ->
6060
let
6161
l =
62-
Debug.log "SendError" ( wsPort, clientId, error )
62+
Debug.log "SendError" ( wsPort, clientId, message, error )
6363
in
6464
model ! []
6565

elm-package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.0.1",
2+
"version": "4.0.0",
33
"summary": "Websocket Server Effects Manager for Elm",
44
"repository": "https://github.com/panosoft/elm-websocket-server.git",
55
"license": "Unlicense",

readme.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,16 @@ Error attempting to send.
146146

147147
```elm
148148
type alias SendErrorTagger msg =
149-
( WSPort, ClientId, String ) -> msg
149+
( WSPort, ClientId, String, String ) -> msg
150150
```
151151

152152
__Usage__
153153

154154
```elm
155-
SendError ( wsPort, clientId, error ) ->
155+
SendError ( wsPort, clientId, message, error ) ->
156156
let
157157
l =
158-
Debug.log "SendError" ( wsPort, clientId, error )
158+
Debug.log "SendError" ( wsPort, clientId, message, error )
159159
in
160160
model ! []
161161
```

src/Websocket.elm

+7-7
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ type alias ListenErrorTagger msg =
115115

116116

117117
type alias SendErrorTagger msg =
118-
( WSPort, ClientId, String ) -> msg
118+
( WSPort, ClientId, String, String ) -> msg
119119

120120

121121
type alias SendTagger msg =
@@ -432,10 +432,10 @@ handleCmd router state cmd =
432432
( Dict.get wsPort state.servers
433433
|?> (\server ->
434434
Dict.get clientId server.clients
435-
|?> (\ws -> Native.Websocket.send (settings0 router (ErrorSend sendErrorTagger wsPort clientId) (SuccessSend sendTagger wsPort clientId message)) ws message)
436-
?= Platform.sendToSelf router (ErrorSend sendErrorTagger wsPort clientId <| "Client does NOT exists with id: " ++ (toString clientId))
435+
|?> (\ws -> Native.Websocket.send (settings0 router (ErrorSend sendErrorTagger wsPort clientId message) (SuccessSend sendTagger wsPort clientId message)) ws message)
436+
?= Platform.sendToSelf router (ErrorSend sendErrorTagger wsPort clientId message <| "Client does NOT exists with id: " ++ (toString clientId))
437437
)
438-
?= Platform.sendToSelf router (ErrorSend sendErrorTagger wsPort clientId <| "Server does NOT exists at specified port: " ++ (toString wsPort))
438+
?= Platform.sendToSelf router (ErrorSend sendErrorTagger wsPort clientId message <| "Server does NOT exists at specified port: " ++ (toString wsPort))
439439
, state
440440
)
441441

@@ -519,7 +519,7 @@ type Msg msg
519519
| Connect WSPort Path ClientId IPAddress Websocket
520520
| Disconnect WSPort Path ClientId IPAddress
521521
| Message WSPort Path QueryString ClientId String
522-
| ErrorSend (SendErrorTagger msg) WSPort ClientId String
522+
| ErrorSend (SendErrorTagger msg) WSPort ClientId String String
523523
| SuccessSend (SendTagger msg) WSPort ClientId String
524524
| SuccessStopServer (ServerStatusTagger msg) WSPort
525525
| ErrorStopServer (ServerErrorTagger msg) WSPort String
@@ -586,12 +586,12 @@ onSelfMsg router selfMsg state =
586586
taggers
587587
|> (toListeners router state (\listenerTaggers -> listenerTaggers.messageTagger ( clientId, queryString, message )))
588588

589-
ErrorSend sendErrorTagger wsPort clientId error ->
589+
ErrorSend sendErrorTagger wsPort clientId message error ->
590590
let
591591
errorMsg =
592592
"Send error: '" ++ error ++ "' for server on port: " ++ (toString wsPort) ++ " for clientId: " ++ (toString clientId)
593593
in
594-
(Platform.sendToApp router <| sendErrorTagger ( wsPort, clientId, errorMsg ))
594+
(Platform.sendToApp router <| sendErrorTagger ( wsPort, clientId, message, errorMsg ))
595595
&> Task.succeed state
596596

597597
SuccessSend sendTagger wsPort clientId message ->

0 commit comments

Comments
 (0)