Skip to content

Commit 4f230b1

Browse files
committed
Add meta channel connection to client-example so we can test seeing all server info messages
1 parent ffe99eb commit 4f230b1

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

client-example/client.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function jwt() {
6464
}
6565

6666
$(document).ready(function () {
67-
var ws = null;
67+
var ws = null, meta = null;
6868

6969
$('#channel').keyup(updateJWT);
7070
updateJWT();
@@ -74,6 +74,10 @@ $(document).ready(function () {
7474
if(ws === null){
7575
var jwt = $('#jwt').val();
7676
var channel = $('#channel').val();
77+
78+
meta = createWebSocket('/server-info/' + jwt);
79+
meta.onmessage = onMessage('#meta-messages');
80+
7781
if(channel == ""){
7882
ws = createWebSocket('/' + jwt);
7983
} else {

client-example/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ <h2>Chat</h2>
3434
<h2>Messages sent to chat channel</h2>
3535
<div id="messages">
3636
</div>
37+
<h2>Messages sent to meta channel</h2>
38+
<div id="meta-messages">
39+
</div>
3740
</div>
3841
</div>
3942
</body>

src/PostgresWebsockets/Middleware.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,16 @@ wsApp Context{..} pendingConn =
9191
validClaims
9292
ctxGetTime
9393

94+
case configMetaChannel ctxConfig of
95+
Nothing -> pure ()
96+
Just ch -> sendNotification "Connecion Open" ch
97+
9498
when (hasRead mode) $
9599
forM_ chs $ flip (onMessage ctxMulti) $ WS.sendTextData conn . B.payload
96100

97101
when (hasWrite mode) $
98102
notifySession conn sendNotification chs
99103

100-
case configMetaChannel ctxConfig of
101-
Nothing -> pure ()
102-
Just ch -> sendNotification "Connecion Open" ch
103-
104104
waitForever <- newEmptyMVar
105105
void $ takeMVar waitForever
106106

0 commit comments

Comments
 (0)