-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some general cleanups, refactoring websocket connection hub
* Removed some unused variables * Working websocket connection hub in a separate package * Broadcast hub info on client changes
- Loading branch information
Showing
4 changed files
with
282 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package ws | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "log" | ||
| "time" | ||
|
|
||
| "github.com/gorilla/websocket" | ||
| "github.com/pion/webrtc/v3" | ||
| ) | ||
|
|
||
| // Client is a middleman between the websocket connection and the hub. | ||
| type Client struct { | ||
| hub *Hub | ||
|
|
||
| // The websocket connection. | ||
| conn *websocket.Conn | ||
|
|
||
| // Buffered channel of outbound messages. | ||
| Send chan []byte | ||
|
|
||
| // webRTC peer connection | ||
| PeerConnection *webrtc.PeerConnection | ||
| } | ||
|
|
||
| func NewClient(hub *Hub, conn *websocket.Conn, webrtcConn *webrtc.PeerConnection) *Client { | ||
| return &Client{ | ||
| hub: hub, | ||
| conn: conn, | ||
| Send: make(chan []byte), | ||
| PeerConnection: webrtcConn, | ||
| } | ||
| } | ||
|
|
||
| // ReadLoop pumps messages from the websocket connection to the hub. | ||
| // | ||
| // The application runs ReadLoop in a per-connection goroutine. The application | ||
| // ensures that there is at most one reader on a connection by executing all | ||
| // reads from this goroutine. | ||
| func (c *Client) ReadLoop() { | ||
| defer func() { | ||
| c.hub.Unregister <- c | ||
| c.conn.Close() | ||
| }() | ||
| c.conn.SetReadLimit(maxMessageSize) | ||
| c.conn.SetReadDeadline(time.Now().Add(pongWait)) | ||
| c.conn.SetPongHandler(func(string) error { c.conn.SetReadDeadline(time.Now().Add(pongWait)); return nil }) | ||
| message := &WebsocketMessage{} | ||
| for { | ||
| // _, message, err := c.conn.ReadMessage() | ||
| _, raw, err := c.conn.ReadMessage() | ||
| if err != nil { | ||
| log.Printf("could not read message: %s", err) | ||
| if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { | ||
| log.Println("ws closed unexpected") | ||
| } | ||
| return | ||
| } | ||
|
|
||
| err = json.Unmarshal(raw, &message) | ||
| if err != nil { | ||
| log.Printf("could not unmarshal ws message: %s", err) | ||
| return | ||
| } | ||
|
|
||
| switch message.Event { | ||
| case MessageTypeCandidate: | ||
| candidate := webrtc.ICECandidateInit{} | ||
| if err := json.Unmarshal([]byte(message.Data), &candidate); err != nil { | ||
| log.Printf("could not unmarshal candidate msg: %s", err) | ||
| return | ||
| } | ||
|
|
||
| if err := c.PeerConnection.AddICECandidate(candidate); err != nil { | ||
| log.Printf("could not add ice candidate: %s", err) | ||
| return | ||
| } | ||
|
|
||
| case MessageTypeAnswer: | ||
| answer := webrtc.SessionDescription{} | ||
| if err := json.Unmarshal([]byte(message.Data), &answer); err != nil { | ||
| log.Printf("could not unmarshal answer msg: %s", err) | ||
| return | ||
| } | ||
|
|
||
| if err := c.PeerConnection.SetRemoteDescription(answer); err != nil { | ||
| log.Printf("could not set remote description: %s", err) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| // we do not send anything to the other clients! | ||
| //message = bytes.TrimSpace(bytes.Replace(message, newline, space, -1)) | ||
| //c.hub.Broadcast <- message | ||
| } | ||
| } | ||
|
|
||
| // WriteLoop pumps messages from the hub to the websocket connection. | ||
| // | ||
| // A goroutine running WriteLoop is started for each connection. The | ||
| // application ensures that there is at most one writer to a connection by | ||
| // executing all writes from this goroutine. | ||
| func (c *Client) WriteLoop() { | ||
| ticker := time.NewTicker(pingPeriod) | ||
| defer func() { | ||
| ticker.Stop() | ||
| c.conn.Close() | ||
| }() | ||
| for { | ||
| select { | ||
| case message, ok := <-c.Send: | ||
| _ = c.conn.SetWriteDeadline(time.Now().Add(writeWait)) | ||
| if !ok { | ||
| // The hub closed the channel. | ||
| _ = c.conn.WriteMessage(websocket.CloseMessage, []byte{}) | ||
| return | ||
| } | ||
|
|
||
| w, err := c.conn.NextWriter(websocket.TextMessage) | ||
| if err != nil { | ||
| return | ||
| } | ||
| _, _ = w.Write(message) | ||
|
|
||
| // Add queued messages to the current websocket message. | ||
| n := len(c.Send) | ||
| for i := 0; i < n; i++ { | ||
| _, _ = w.Write([]byte{'\n'}) | ||
| message = <-c.Send | ||
| _, _ = w.Write(message) | ||
| } | ||
|
|
||
| if err := w.Close(); err != nil { | ||
| return | ||
| } | ||
|
|
||
| case <-ticker.C: | ||
| c.conn.SetWriteDeadline(time.Now().Add(writeWait)) | ||
| if err := c.conn.WriteMessage(websocket.PingMessage, nil); err != nil { | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.