From d3e6010e0777624bfeee61722654b8a7d1237964 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Sun, 26 Jun 2022 21:52:28 +0200
Subject: [PATCH] add check for ws.user again

---
 src/socket/SocketClient.js | 4 ++--
 src/socket/SocketServer.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/socket/SocketClient.js b/src/socket/SocketClient.js
index 207d92f..8911bf4 100644
--- a/src/socket/SocketClient.js
+++ b/src/socket/SocketClient.js
@@ -66,8 +66,8 @@ class SocketClient extends EventEmitter {
         this.readyState = WebSocket.CLOSING;
         this.ws.close();
       }
-      if (now - 43000 > this.timeLastSent) {
-        // make sure we send something at least all 45s
+      if (now - 23000 > this.timeLastSent) {
+        // make sure we send something at least all 25s
         this.sendWhenReady(Ping.dehydrate());
       }
     }
diff --git a/src/socket/SocketServer.js b/src/socket/SocketServer.js
index c625ce3..cf7c13a 100644
--- a/src/socket/SocketServer.js
+++ b/src/socket/SocketServer.js
@@ -368,7 +368,9 @@ class SocketServer {
     let client = it.next();
     while (!client.done) {
       const ws = client.value;
-      if (ws.readyState === WebSocket.OPEN) {
+      if (ws.readyState === WebSocket.OPEN 
+        && ws.user
+      ) {
         const canvasId = ws.canvasId || 0;
         const { ip } = ws.user;
         // only count unique IPs per canvas