fix: prevent infinite close event if some removeClient method throws

collective-soundworks · Jul 17, 2023 · 5e2a12e · 5e2a12e
1 parent 5518add
commit 5e2a12e
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/server/Server.js b/src/server/Server.js
@@ -861,12 +861,19 @@ Invalid certificate files, please check your:
         if (this._trustedClients.has(client)) {
           this._trustedClients.delete(client);
         }
-        // clean context manager, await before cleaning state manager
-        await this.contextManager.removeClient(client);
-        // remove client from pluginManager
-        await this.pluginManager.removeClient(client);
-        // clean state manager
-        await this.stateManager.removeClient(client.id);
+
+        // if something goes wrong here, the 'close' event is called again and
+        // again and again... let's just log the error and terminate the socket
+        try {
+          // clean context manager, await before cleaning state manager
+          await this.contextManager.removeClient(client);
+          // remove client from pluginManager
+          await this.pluginManager.removeClient(client);
+          // clean state manager
+          await this.stateManager.removeClient(client.id);
+        } catch (err) {
+          console.error(err);
+        }
       }
 
       // clean sockets