more reliable disconnects?

Author: GarboMuffin

src/Client.js

@@ -99,18 +99,20 @@ class Client {
   /**
    * Send a message to the client.
    * @param {import('ws').Data} data The data to send.
+   * @returns {boolean} true if written
    */
   send(data) {
     if (this.ws === null) {
       this.log('Cannot send message; ws is null');
-      return;
+      return false;
     }
     if (this.ws.readyState !== this.ws.OPEN) {
       this.log('Cannot send message; readyState ' + this.ws.readyState);
-      return;
+      return false;
     }
     this.isDraining = true;
     this.ws.send(data, this.handleSent);
+    return true;
   }
 
   handleSent() {

src/ConnectionManager.js

@@ -46,6 +46,7 @@ class ConnectionManager {
       }
     }
 
+    const timedOut = [];
     this.clientBuckets[bucketNumber].forEach((client) => {
       if (!client.ws) {
         client.timedOut('no ws');
@@ -69,6 +70,10 @@ class ConnectionManager {
       // Clients are sent a ping, and expected to respond to the ping by the time the next ping will be sent.
       client.ping();
     });
+
+    for (const client of timedOut) {
+      this.handleDisconnect(client);
+    }
   }
 
   getNextClientBucket () {
@@ -92,6 +97,7 @@ class ConnectionManager {
    * @param {Client} client The Client disconnecting.
    */
   handleDisconnect(client) {
+    client.room?.removeClient(client);
     this.clientBuckets[client.bucket].delete(client);
     this.allClients.delete(client);
   }

src/Room.js

@@ -68,12 +68,11 @@ class Room {
   /**
    * Remove a client.
    * @param {Client} client The client to remove
-   * @throws Will throw if the client is not part of this room.
    */
   removeClient(client) {
     const index = this.clients.indexOf(client);
     if (index === -1) {
-      throw new Error(`Client is not part of room ${this.id}`);
+      return;
     }
     this.clients.splice(index, 1);
     this.lastDisconnectTime = Date.now();

src/server.js

@@ -76,8 +76,10 @@ function sendBuffered() {
       dataToSend += createSetMessage(name, value);
     }
     stats.recordBytesSent(client, dataToSend.length);
-    client.send(dataToSend);
     client.bufferedVariableSets.clear();
+    if (!client.send(dataToSend)) {
+      connectionManager.handleDisconnect(client);
+    }
   }
 }
 
@@ -87,7 +89,9 @@ function sendSetMessageToClient(client, name, value) {
   } else {
     const dataToSend = createSetMessage(name, value);
     stats.recordBytesSent(client, dataToSend.length);
-    client.send(dataToSend);
+    if (!client.send(dataToSend)) {
+      connectionManager.handleDisconnect(client);
+    }
   }
 }