LogalDeveloper/owncast
0
Fork 0
Code Activity

Chat updates (#92)

Browse Source 
* Send PONG responses to PINGs

* Split out client IDs for viewer counts vs. websocket IDs

* WIP username change event

* Display username changes

* Revert commented out code

* Add support for building from the current branch

* Fix PONG

* Make username changes have a unique ID

* Add a version param to js to cachebust
This commit is contained in:
Gabe Kangas
2020-07-28 21:30:03 -07:00
committed by GitHub
parent 87636a4183
commit d9509f5606
9 changed files with 161 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
core/chat/client.go
View File

@@ -1,6 +1,7 @@
package chat
import (
"encoding/json"
"fmt"
"io"
"time"
@@ -21,14 +22,23 @@ type Client struct {
ConnectedAt time.Time
MessageCount int
id string
ws *websocket.Conn
ch chan models.ChatMessage
pingch chan models.PingMessage
clientID string // How we identify unique viewers when counting viewer counts.
socketID string // How we identify a single websocket client.
ws *websocket.Conn
ch chan models.ChatMessage
pingch chan models.PingMessage
usernameChangeChannel chan models.NameChangeEvent
doneCh chan bool
}
const (
CHAT = "CHAT"
NAMECHANGE = "NAME_CHANGE"
PING = "PING"
PONG = "PONG"
)
//NewClient creates a new chat client
func NewClient(ws *websocket.Conn) *Client {
if ws == nil {
@@ -38,9 +48,12 @@ func NewClient(ws *websocket.Conn) *Client {
ch := make(chan models.ChatMessage, channelBufSize)
doneCh := make(chan bool)
pingch := make(chan models.PingMessage)
clientID := utils.GenerateClientIDFromRequest(ws.Request())
usernameChangeChannel := make(chan models.NameChangeEvent)
return &Client{time.Now(), 0, clientID, ws, ch, pingch, doneCh}
clientID := utils.GenerateClientIDFromRequest(ws.Request())
socketID, _ := shortid.Generate()
return &Client{time.Now(), 0, clientID, socketID, ws, ch, pingch, usernameChangeChannel, doneCh}
}
//GetConnection gets the connection for the client
@@ -53,7 +66,7 @@ func (c *Client) Write(msg models.ChatMessage) {
case c.ch <- msg:
default:
_server.remove(c)
_server.err(fmt.Errorf("client %s is disconnected", c.id))
_server.err(fmt.Errorf("client %s is disconnected", c.clientID))
}
}
@@ -79,7 +92,8 @@ func (c *Client) listenWrite() {
case msg := <-c.ch:
// log.Println("Send:", msg)
websocket.JSON.Send(c.ws, msg)
case msg := <-c.usernameChangeChannel:
websocket.JSON.Send(c.ws, msg)
// receive done request
case <-c.doneCh:
_server.remove(c)
@@ -102,28 +116,59 @@ func (c *Client) listenRead() {
// read data from websocket connection
default:
var msg models.ChatMessage
id, err := shortid.Generate()
var data []byte
err := websocket.Message.Receive(c.ws, &data)
if err != nil {
log.Panicln(err)
if err == io.EOF {
c.doneCh <- true
} else {
log.Errorln(err)
}
return
}
msg.ID = id
msg.MessageType = "CHAT"
msg.Timestamp = time.Now()
msg.Visible = true
var messageTypeCheck map[string]interface{}
err = json.Unmarshal(data, &messageTypeCheck)
if err != nil {
log.Errorln(err)
}
if err := websocket.JSON.Receive(c.ws, &msg); err == io.EOF {
c.doneCh <- true
return
} else if err != nil {
_server.err(err)
} else {
c.MessageCount++
messageType := messageTypeCheck["type"]
msg.ClientID = c.id
_server.SendToAll(msg)
if messageType == CHAT {
c.chatMessageReceived(data)
} else if messageType == NAMECHANGE {
c.userChangedName(data)
}
}
}
}
func (c *Client) userChangedName(data []byte) {
var msg models.NameChangeEvent
err := json.Unmarshal(data, &msg)
if err != nil {
log.Errorln(err)
}
msg.Type = NAMECHANGE
msg.ID = shortid.MustGenerate()
_server.usernameChanged(msg)
}
func (c *Client) chatMessageReceived(data []byte) {
var msg models.ChatMessage
err := json.Unmarshal(data, &msg)
if err != nil {
log.Errorln(err)
}
id, _ := shortid.Generate()
msg.ID = id
msg.Timestamp = time.Now()
msg.Visible = true
c.MessageCount++
msg.ClientID = c.clientID
_server.SendToAll(msg)
}