Migrating to uWS

back/src/Model/Websocket/ExSocketInterface.ts

@@ -1,11 +1,11 @@
-import {Socket} from "socket.io";
 import {PointInterface} from "./PointInterface";
 import {Identificable} from "./Identificable";
 import {TokenInterface} from "../../Controller/AuthenticateController";
 import {ViewportInterface} from "_Model/Websocket/ViewportMessage";
 import {BatchMessage, SubMessage} from "../../Messages/generated/messages_pb";
+import {WebSocket} from "uWebSockets.js"
 
-export interface ExSocketInterface extends Socket, Identificable {
+export interface ExSocketInterface extends WebSocket, Identificable {
     token: string;
     roomId: string;
     webRtcRoomId: string|undefined;
@@ -19,7 +19,8 @@ export interface ExSocketInterface extends Socket, Identificable {
     /**
      * Pushes an event that will be sent in the next batch of events
      */
-    emitInBatch: (event: string, payload: SubMessage) => void;
+    emitInBatch: (payload: SubMessage) => void;
     batchedMessages: BatchMessage;
     batchTimeout: NodeJS.Timeout|null;
+    disconnecting: boolean
 }

back/src/Model/Websocket/ProtobufUtils.ts

@@ -1,8 +1,9 @@
 import {PointInterface} from "./PointInterface";
-import {ItemEventMessage, PositionMessage} from "../../Messages/generated/messages_pb";
+import {ItemEventMessage, PointMessage, PositionMessage} from "../../Messages/generated/messages_pb";
 import {ExSocketInterface} from "_Model/Websocket/ExSocketInterface";
 import Direction = PositionMessage.Direction;
 import {ItemEventMessageInterface} from "_Model/Websocket/ItemEventMessage";
+import {PositionInterface} from "_Model/PositionInterface";
 
 export class ProtobufUtils {
 
@@ -34,6 +35,42 @@ export class ProtobufUtils {
         return position;
     }
 
+    public static toPointInterface(position: PositionMessage): PointInterface {
+        let direction: string;
+        switch (position.getDirection()) {
+            case Direction.UP:
+                direction = 'up';
+                break;
+            case Direction.DOWN:
+                direction = 'down';
+                break;
+            case Direction.LEFT:
+                direction = 'left';
+                break;
+            case Direction.RIGHT:
+                direction = 'right';
+                break;
+            default:
+                throw new Error("Unexpected direction");
+        }
+
+        // sending to all clients in room except sender
+        return {
+            x: position.getX(),
+            y: position.getY(),
+            direction,
+            moving: position.getMoving(),
+        };
+    }
+
+    public static toPointMessage(point: PositionInterface): PointMessage {
+        const position = new PointMessage();
+        position.setX(Math.floor(point.x));
+        position.setY(Math.floor(point.y));
+
+        return position;
+    }
+
     public static toItemEvent(itemEventMessage: ItemEventMessage): ItemEventMessageInterface {
         return {
             itemId: itemEventMessage.getItemid(),