reorder staleClients.go

internal/websocket/handle_connection.go

@@ -2,19 +2,13 @@ package websocket
 
 import (
 	"github.com/gorilla/websocket"
-	"net"
 	"net/http"
-	"sync"
 	"time"
 
 	"git.smsvc.net/pomodoro/GoTomato/internal/helper"
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
-// Clients is a map of connected WebSocket clients, where each client is represented by the WebsocketClient struct
-var Clients = make(map[net.Addr]*models.WebsocketClient)
-var mu sync.Mutex // Mutex to protect access to the Clients map
-
 // Upgrade HTTP requests to WebSocket connections
 var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool { return true },

internal/websocket/staleClients.go

@@ -8,21 +8,6 @@ import (
 	"github.com/gorilla/websocket"
 )
 
-func sendPing(client *models.WebsocketClient) bool {
-	client.Conn.SetWriteDeadline(time.Now().Add(SEND_TIMEOUT * time.Second))
-	err := client.Conn.WriteMessage(websocket.PingMessage, nil)
-
-	if err != nil {
-		return false
-	}
-
-	return true
-}
-
-func isStale(client *models.WebsocketClient) bool {
-	return time.Since(client.LastPong) > (STALE_CLIENT_TIMEOUT * time.Second)
-}
-
 // Check and remove stale clients
 func RemoveStaleClients() {
 	ticker := time.NewTicker(STALE_CHECK_INTERVALL * time.Second)
@@ -40,3 +25,18 @@ func RemoveStaleClients() {
 		mu.Unlock()
 	}
 }
+
+func sendPing(client *models.WebsocketClient) bool {
+	client.Conn.SetWriteDeadline(time.Now().Add(SEND_TIMEOUT * time.Second))
+	err := client.Conn.WriteMessage(websocket.PingMessage, nil)
+
+	if err != nil {
+		return false
+	}
+
+	return true
+}
+
+func isStale(client *models.WebsocketClient) bool {
+	return time.Since(client.LastPong) > (STALE_CLIENT_TIMEOUT * time.Second)
+}

internal/websocket/timeouts.go

@@ -1,5 +0,0 @@
-package websocket
-
-const SEND_TIMEOUT = 10
-const STALE_CLIENT_TIMEOUT = 90
-const STALE_CHECK_INTERVALL = 30

internal/websocket/vars.go

@@ -0,0 +1,18 @@
+package websocket
+
+import (
+	"net"
+	"sync"
+
+	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
+)
+
+const SEND_TIMEOUT = 10
+const STALE_CLIENT_TIMEOUT = 90
+const STALE_CHECK_INTERVALL = 30
+
+// Clients is a map of connected WebSocket clients, where each client is represented by the WebsocketClient struct
+var Clients = make(map[net.Addr]*models.WebsocketClient)
+
+// Mutex to protect access to the Clients map
+var mu sync.Mutex