Simplifying error handling

back/src/RoomManager.ts

@@ -45,7 +45,7 @@ const roomManager: IRoomManagerServer = {
         let room: GameRoom | null = null;
         let user: User | null = null;
 
-        call.on("data", (message: PusherToBackMessage) => {
+        call.on("data", async (message: PusherToBackMessage) => {
             try {
                 if (room === null || user === null) {
                     if (message.hasJoinroommessage()) {
@@ -78,7 +78,11 @@ const roomManager: IRoomManagerServer = {
                     } else if (message.hasItemeventmessage()) {
                         socketManager.handleItemEvent(room, user, message.getItemeventmessage() as ItemEventMessage);
                     } else if (message.hasVariablemessage()) {
-                        socketManager.handleVariableEvent(room, user, message.getVariablemessage() as VariableMessage);
+                        await socketManager.handleVariableEvent(
+                            room,
+                            user,
+                            message.getVariablemessage() as VariableMessage
+                        );
                     } else if (message.hasWebrtcsignaltoservermessage()) {
                         socketManager.emitVideo(
                             room,
@@ -119,6 +123,7 @@ const roomManager: IRoomManagerServer = {
                     }
                 }
             } catch (e) {
+                console.error(e);
                 emitError(call, e);
                 call.end();
             }

back/src/Services/SocketManager.ts

@@ -129,30 +129,25 @@ export class SocketManager {
     }
 
     handleUserMovesMessage(room: GameRoom, user: User, userMovesMessage: UserMovesMessage) {
-        try {
+        const userMoves = userMovesMessage.toObject();
-            const userMoves = userMovesMessage.toObject();
+        const position = userMovesMessage.getPosition();
-            const position = userMovesMessage.getPosition();
 
-            // If CPU is high, let's drop messages of users moving (we will only dispatch the final position)
+        // If CPU is high, let's drop messages of users moving (we will only dispatch the final position)
-            if (cpuTracker.isOverHeating() && userMoves.position?.moving === true) {
+        if (cpuTracker.isOverHeating() && userMoves.position?.moving === true) {
-                return;
+            return;
-            }
-
-            if (position === undefined) {
-                throw new Error("Position not found in message");
-            }
-            const viewport = userMoves.viewport;
-            if (viewport === undefined) {
-                throw new Error("Viewport not found in message");
-            }
-
-            // update position in the world
-            room.updatePosition(user, ProtobufUtils.toPointInterface(position));
-            //room.setViewport(client, client.viewport);
-        } catch (e) {
-            console.error('An error occurred on "user_position" event');
-            console.error(e);
         }
+
+        if (position === undefined) {
+            throw new Error("Position not found in message");
+        }
+        const viewport = userMoves.viewport;
+        if (viewport === undefined) {
+            throw new Error("Viewport not found in message");
+        }
+
+        // update position in the world
+        room.updatePosition(user, ProtobufUtils.toPointInterface(position));
+        //room.setViewport(client, client.viewport);
     }
 
     // Useless now, will be useful again if we allow editing details in game
@@ -171,43 +166,26 @@ export class SocketManager {
     }*/
 
     handleSilentMessage(room: GameRoom, user: User, silentMessage: SilentMessage) {
-        try {
+        room.setSilent(user, silentMessage.getSilent());
-            room.setSilent(user, silentMessage.getSilent());
-        } catch (e) {
-            console.error('An error occurred on "handleSilentMessage"');
-            console.error(e);
-        }
     }
 
     handleItemEvent(room: GameRoom, user: User, itemEventMessage: ItemEventMessage) {
         const itemEvent = ProtobufUtils.toItemEvent(itemEventMessage);
 
-        try {
+        const subMessage = new SubMessage();
-            const subMessage = new SubMessage();
+        subMessage.setItemeventmessage(itemEventMessage);
-            subMessage.setItemeventmessage(itemEventMessage);
 
-            // Let's send the event without using the SocketIO room.
+        // Let's send the event without using the SocketIO room.
-            // TODO: move this in the GameRoom class.
+        // TODO: move this in the GameRoom class.
-            for (const user of room.getUsers().values()) {
+        for (const user of room.getUsers().values()) {
-                user.emitInBatch(subMessage);
+            user.emitInBatch(subMessage);
-            }
-
-            room.setItemState(itemEvent.itemId, itemEvent.state);
-        } catch (e) {
-            console.error('An error occurred on "item_event"');
-            console.error(e);
         }
+
+        room.setItemState(itemEvent.itemId, itemEvent.state);
     }
 
-    handleVariableEvent(room: GameRoom, user: User, variableMessage: VariableMessage) {
+    handleVariableEvent(room: GameRoom, user: User, variableMessage: VariableMessage): Promise<void> {
-        (async () => {
+        return room.setVariable(variableMessage.getName(), variableMessage.getValue(), user);
-            try {
-                await room.setVariable(variableMessage.getName(), variableMessage.getValue(), user);
-            } catch (e) {
-                console.error('An error occurred on "handleVariableEvent"');
-                console.error(e);
-            }
-        })();
     }
 
     emitVideo(room: GameRoom, user: User, data: WebRtcSignalToServerMessage): void {
@@ -543,16 +521,11 @@ export class SocketManager {
     }
 
     emitPlayGlobalMessage(room: GameRoom, playGlobalMessage: PlayGlobalMessage) {
-        try {
+        const serverToClientMessage = new ServerToClientMessage();
-            const serverToClientMessage = new ServerToClientMessage();
+        serverToClientMessage.setPlayglobalmessage(playGlobalMessage);
-            serverToClientMessage.setPlayglobalmessage(playGlobalMessage);
 
-            for (const [id, user] of room.getUsers().entries()) {
+        for (const [id, user] of room.getUsers().entries()) {
-                user.socket.write(serverToClientMessage);
+            user.socket.write(serverToClientMessage);
-            }
-        } catch (e) {
-            console.error('An error occurred on "emitPlayGlobalMessage" event');
-            console.error(e);
         }
     }