mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-21 20:28:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add in the optimization where multiple websocket events can exist within a single message

Browse source
This commit is contained in:
Gabe Kangas 2021-07-26 19:23:15 -07:00
parent 8b2747e4d7
commit fac06257ad
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/chat/chatclient.go
View file

@ -135,6 +135,14 @@ func (c *ChatClient) writePump() {
log.Debugln(err)
}
// Optimization: Send multiple events in a single websocket message.
// Add queued chat messages to the current websocket message.
n := len(c.send)
for i := 0; i < n; i++ {
_, _ = w.Write(newline)
_, _ = w.Write(<-c.send)
}
if err := w.Close(); err != nil {
return
}

39
webroot/js/utils/websocket.js
View file

@ -153,26 +153,31 @@ export default class Websocket {
pass it along to listeners.
*/
onMessage(e) {
try {
var model = JSON.parse(e.data);
} catch (e) {
// console.log(e, e.data);
return;
}
// Optimization where multiple events can be sent within a
// single websocket message. So split them if needed.
var messages = e.data.split('\n');
for (var i = 0; i < messages.length; i++) {
try {
var model = JSON.parse(e.data);
} catch (e) {
// console.log(e, e.data);
return;
}
if (!model.type) {
console.error('No type provided', model);
return;
}
if (!model.type) {
console.error('No type provided', model);
return;
}
// Send PONGs
if (model.type === SOCKET_MESSAGE_TYPES.PING) {
this.sendPong();
return;
}
// Send PONGs
if (model.type === SOCKET_MESSAGE_TYPES.PING) {
this.sendPong();
return;
}
// Notify any of the listeners via the raw socket message callback.
this.notifyRawMessageListeners(model);
// Notify any of the listeners via the raw socket message callback.
this.notifyRawMessageListeners(model);
}
}
// Reply to a PING as a keep alive.