dave/youtube-downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve client disconnect detection

Browse Source
This commit is contained in:
David Majdandžić
2024-06-27 11:05:30 +02:00
parent 4acb89cdb1
commit 4ca3053243
3 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
ws-server/connection.go
View File

@@ -3,12 +3,14 @@ package main
import (
"log"
"sync"
"sync/atomic"
"time"
"github.com/gorilla/websocket"
)
type WSConnection struct {
id int32
conn *websocket.Conn
writeLock sync.Mutex
alive bool
@@ -21,6 +23,7 @@ type WSConnection struct {
func NewConn(conn *websocket.Conn, server *WSServer) *WSConnection {
wsconn := &WSConnection{
id: server.clientId,
conn: conn,
alive: true,
IdleTimeout: server.IdleTimeout,
@@ -29,6 +32,7 @@ func NewConn(conn *websocket.Conn, server *WSServer) *WSConnection {
WriteChan: make(chan string, 1024),
ErrorChan: make(chan error, 1),
}
atomic.AddInt32(&server.clientId, 1)
return wsconn
}
@@ -36,11 +40,16 @@ func NewConn(conn *websocket.Conn, server *WSServer) *WSConnection {
func (ws *WSConnection) Open() {
go ws.messageReader()
go ws.messageSender()
// go ws.pinger()
go ws.pinger()
ws.conn.SetPongHandler(func(string) error {
// log.Printf("Client %d: Pong OK", ws.id)
ws.conn.SetReadDeadline(time.Now().Add(ws.IdleTimeout))
return nil
})
}
func (ws *WSConnection) messageReader() {
log.Printf("Reading messages")
log.Printf("Client %d: Reading messages", ws.id)
for {
_, message, err := ws.conn.ReadMessage()
if !ws.alive {
@@ -51,48 +60,52 @@ func (ws *WSConnection) messageReader() {
ws.ErrorChan <- err
return
}
log.Printf("Received: %s, %d in output channel", message, len(ws.ReadChan))
log.Printf("Client %d: Received: %s, %d in output channel", ws.id, message, len(ws.ReadChan))
ws.ReadChan <- string(message)
}
}
func (ws *WSConnection) messageSender() {
log.Printf("Sending messages")
log.Printf("Client %d: Sending messages", ws.id)
for {
msg := <-ws.WriteChan
if !ws.alive {
return
}
ws.writeLock.Lock()
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
log.Printf("Sending: %s, %d in input channel", msg, len(ws.WriteChan))
err := ws.conn.WriteMessage(websocket.TextMessage, []byte(msg))
if err != nil {
log.Printf("Error during message writing: %v", err)
ws.ErrorChan <- err
return
}
ws.writeLock.Unlock()
func() {
msg, ok := <-ws.WriteChan
if !ok || !ws.alive {
return
}
ws.writeLock.Lock()
defer ws.writeLock.Unlock()
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
log.Printf("Client %d: Sending: %s, %d in input channel", ws.id, msg, len(ws.WriteChan))
err := ws.conn.WriteMessage(websocket.TextMessage, []byte(msg))
if err != nil {
log.Printf("Client %d: Error during message writing: %v", ws.id, err)
ws.ErrorChan <- err
return
}
}()
}
}
// func (ws *WSConnection) pinger() {
// log.Printf("Starting pinger, sleeping for %v", ws.PingInterval)
// for {
// time.Sleep(ws.PingInterval)
// if !ws.alive {
// return
// }
func (ws *WSConnection) pinger() {
log.Printf("Client %d: Starting pinger, sleeping for %v", ws.id, ws.PingInterval)
for {
time.Sleep(ws.PingInterval)
if !ws.alive {
return
}
// log.Printf("Ping")
// ws.writeLock.Lock()
// err := ws.conn.WriteMessage(websocket.PingMessage, nil)
// if err != nil {
// log.Println("Error during ping:", err)
// ws.ErrorChan <- err
// return
// }
// ws.writeLock.Unlock()
// }
// }
// log.Printf("Client %d: Ping", ws.id)
ws.writeLock.Lock()
err := ws.conn.WriteMessage(websocket.PingMessage, nil)
if err != nil {
log.Printf("Client %d: Error during ping: %+v", ws.id, err)
ws.ErrorChan <- err
return
}
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
ws.writeLock.Unlock()
// log.Printf("Client %d: Ping OK", ws.id)
}
}