Merge branch 'develop' of github.com:thecodingmachine/workadventure

pusher/src/Services/SocketManager.ts

@@ -359,11 +359,7 @@ export class SocketManager implements ZoneEventListener {
                         debug("Leaving room %s.", socket.roomId);
 
                         room.leave(socket);
-                        if (room.isEmpty()) {
-                            room.close();
-                            this.rooms.delete(socket.roomId);
-                            debug("Room %s is empty. Deleting.", socket.roomId);
-                        }
+                        this.deleteRoomIfEmpty(room);
                     } else {
                         console.error("Could not find the GameRoom the user is leaving!");
                     }
@@ -382,6 +378,21 @@ export class SocketManager implements ZoneEventListener {
         }
     }
 
+    private deleteRoomIfEmpty(room: PusherRoom): void {
+        if (room.isEmpty()) {
+            room.close();
+            this.rooms.delete(room.roomUrl);
+            debug("Room %s is empty. Deleting.", room.roomUrl);
+        }
+    }
+
+    public deleteRoomIfEmptyFromId(roomUrl: string): void {
+        const room = this.rooms.get(roomUrl);
+        if (room) {
+            this.deleteRoomIfEmpty(room);
+        }
+    }
+
     async getOrCreateRoom(roomUrl: string): Promise<PusherRoom> {
         //check and create new world for a room
         let room = this.rooms.get(roomUrl);