From a9c2289d4f1639704eef55282d7cce951cf19e17 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Sun, 26 Jun 2022 21:19:19 +0200
Subject: [PATCH] increase timeouts for pings

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

diff --git a/src/socket/SocketClient.js b/src/socket/SocketClient.js
index 2459f10..207d92f 100644
--- a/src/socket/SocketClient.js
+++ b/src/socket/SocketClient.js
@@ -60,14 +60,14 @@ class SocketClient extends EventEmitter {
   checkHealth() {
     if (this.readyState === WebSocket.OPEN) {
       const now = Date.now();
-      if (now - 14000 > this.timeLastPing) {
+      if (now - 20000 > this.timeLastPing) {
         // server didn't send anything, probably dead
         console.log('Server is silent, killing websocket');
         this.readyState = WebSocket.CLOSING;
         this.ws.close();
       }
-      if (now - 10000 > this.timeLastSent) {
-        // make sure we send something at least all 12s
+      if (now - 43000 > this.timeLastSent) {
+        // make sure we send something at least all 45s
         this.sendWhenReady(Ping.dehydrate());
       }
     }
diff --git a/src/socket/SocketServer.js b/src/socket/SocketServer.js
index 34eb52e..c625ce3 100644
--- a/src/socket/SocketServer.js
+++ b/src/socket/SocketServer.js
@@ -368,9 +368,7 @@ class SocketServer {
     let client = it.next();
     while (!client.done) {
       const ws = client.value;
-      if (ws.readyState === WebSocket.OPEN
-        && ws.user
-      ) {
+      if (ws.readyState === WebSocket.OPEN) {
         const canvasId = ws.canvasId || 0;
         const { ip } = ws.user;
         // only count unique IPs per canvas