Changed addRoute method to be easier to understand

server/src/socket/hapticLinkServer.ts

@@ -50,12 +50,16 @@ export class HapticLinkServer {
         return true;
     }
 
-    addRoute(route: Route<any>): boolean {
-        if (route.name in this.routes) {
+    addRoute<T>(name: string, schema: ZodSchema<T>, handler: RouteHandler<T>): boolean {
+        if (name in this.routes) {
             return false
         }
 
-        this.routes[route.name] = route;
+        this.routes[name] = {
+            name,
+            schema,
+            handler
+        }
 
         return true;
     }

server/src/socket/routes.ts

@@ -1,12 +1,13 @@
 import { HapticLinkServer } from "./hapticLinkServer";
-import JoinRoomRoute from "./routes/join_room";
-import LeaveRoomRoute from "./routes/leave_room";
-import SendVibrationRoute from "./routes/send_vibration";
-import TestConnectionRoute from "./routes/test_connection";
+import { JoinRoomHandler, JoinRoomSchema } from "./routes/join_room";
+import { LeaveRoomHandler, LeaveRoomSchema } from "./routes/leave_room";
+import { SetUsernameHandler, SetUsernameSchema } from "./routes/set_username";
+import { TestConnnectionSchema, TestConnectionHandler } from "./routes/test_connection";
 
 export function registerRoutes(router: HapticLinkServer) {
-    router.addRoute(TestConnectionRoute);
-    router.addRoute(JoinRoomRoute);
-    router.addRoute(LeaveRoomRoute);
-    router.addRoute(SendVibrationRoute);
+    router.addRoute("test_connection", TestConnnectionSchema, TestConnectionHandler);
+    router.addRoute("join_room", JoinRoomSchema, JoinRoomHandler);
+    router.addRoute("leave_room", LeaveRoomSchema, LeaveRoomHandler);
+    router.addRoute("send_touch", LeaveRoomSchema, LeaveRoomHandler);
+    router.addRoute("set_username", SetUsernameSchema, SetUsernameHandler);
 }

server/src/socket/routes/join_room.ts

@@ -3,42 +3,36 @@ import { Context, Route } from "../hapticLinkServer";
 import { generateSessionToken } from "../../helpers";
 import { Room } from "../room";
 
-interface JoinRoomPayload {
+export interface JoinRoomPayload {
     roomId?: string;
     username?: string;
 }
-const JoinRoomSchema = z.object({
+export const JoinRoomSchema = z.object({
     roomId: z.string().optional(),
     username: z.string().optional(),
 })
 
-const JoinRoomRoute: Route<JoinRoomPayload> = {
-    name: "join_room",
-    handler: function(ctx: Context<JoinRoomPayload>) {
-        // Set username if payload has it
-        if (ctx.payload.username) {
-            ctx.user.username = ctx.payload.username;
-        }
+export function JoinRoomHandler(ctx: Context<JoinRoomPayload>) {
+    // Set username if payload has it
+    if (ctx.payload.username) {
+        ctx.user.username = ctx.payload.username;
+    }
 
-        let room: Room;
+    let room: Room;
 
-        if (ctx.payload.roomId && !ctx.server.rooms[ctx.payload.roomId]) {
-            room = new Room(ctx.payload.roomId);
-            ctx.server.rooms[room.id] = room;
-        } else if (!ctx.payload.roomId) {
-            ctx.payload.roomId = generateSessionToken(12);
-            room = new Room(ctx.payload.roomId);
-            ctx.server.rooms[room.id] = room;
-        } else {
-            room = ctx.server.rooms[ctx.payload.roomId]
-        }
+    if (ctx.payload.roomId && !ctx.server.rooms[ctx.payload.roomId]) {
+        room = new Room(ctx.payload.roomId);
+        ctx.server.rooms[room.id] = room;
+    } else if (!ctx.payload.roomId) {
+        ctx.payload.roomId = generateSessionToken(12);
+        room = new Room(ctx.payload.roomId);
+        ctx.server.rooms[room.id] = room;
+    } else {
+        room = ctx.server.rooms[ctx.payload.roomId]
+    }
 
-        ctx.user.currentRoom = room;
+    ctx.user.currentRoom = room;
 
-        // Broadcasts message to room
-        room.addUser(ctx.user);
-    },
-    schema: JoinRoomSchema,
+    // Broadcasts message to room
+    room.addUser(ctx.user);
 }
-
-export default JoinRoomRoute;

server/src/socket/routes/leave_room.ts

@@ -1,33 +1,27 @@
-
 import { z } from "zod";
 import { Context, Route } from "../hapticLinkServer";
 
-interface LeaveRoomPayload {
+export interface LeaveRoomPayload {
     roomId: string;
 }
-const LeaveRoomSchema = z.object({
+
+export const LeaveRoomSchema = z.object({
     roomId: z.string(),
 })
 
-const LeaveRoomRoute: Route<LeaveRoomPayload> = {
-    name: "leave_room",
-    handler: function(ctx: Context<LeaveRoomPayload>) {
-        const room = ctx.user.currentRoom;
+export function LeaveRoomHandler(ctx: Context<LeaveRoomPayload>) {
+    const room = ctx.user.currentRoom;
 
-        if (!room) {
-            return ctx.ws.send(JSON.stringify({
-                message: "leave_room_response",
-                status: "you are not part of that room"
-            }))
-        } else {
-            room.removeUserById(ctx.user.id);
-            return ctx.ws.send(JSON.stringify({
-                message: "leave_room_response",
-                status: "room left"
-            }))
-        }
-    },
-    schema: LeaveRoomSchema,
+    if (!room) {
+        return ctx.ws.send(JSON.stringify({
+            message: "leave_room_response",
+            status: "you are not part of that room"
+        }))
+    } else {
+        room.removeUserById(ctx.user.id);
+        return ctx.ws.send(JSON.stringify({
+            message: "leave_room_response",
+            status: "room left"
+        }))
+    }
 }
-
-export default LeaveRoomRoute;

server/src/socket/routes/send_vibration.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { Context, Route } from "../hapticLinkServer";
 
-interface SendVibrationPayload {
+export interface SendVibrationPayload {
     id: number;
     type: "enabled" | "disabled";
     position: {
@@ -12,7 +12,7 @@ interface SendVibrationPayload {
     intensity?: number;
 }
 
-const SendVibrationSchema = z.object({
+export const SendVibrationSchema = z.object({
     id: z.number(),
     type: z.union([z.literal("enabled"), z.literal("disabled")]),
     position: z.object({
@@ -23,31 +23,25 @@ const SendVibrationSchema = z.object({
     intensity: z.number().optional(),
 });
 
-const SendVibrationRoute: Route<SendVibrationPayload> = {
-    name: "send_touch",
-    handler: function(ctx: Context<SendVibrationPayload>) {
-        if (!ctx.user.currentRoom) {
-            return ctx.ws.send(JSON.stringify({
-                "message": "send_vibration_response",
-                "status": "not part of a room",
-            }))
-        }
+export function SendVibrationHandler(ctx: Context<SendVibrationPayload>) {
+    if (!ctx.user.currentRoom) {
+        return ctx.ws.send(JSON.stringify({
+            "message": "send_vibration_response",
+            "status": "not part of a room",
+        }))
+    }
 
-        const p = ctx.payload;
+    const p = ctx.payload;
 
-        ctx.user.currentRoom.broadcast(JSON.stringify({
-            message: "receieve_touch",
-            id: ctx.user.id + "_" + p.id,
-            type: p.type,
-            user: {
-                username: ctx.user.username,
-                id: ctx.user.id,
-            },
-            color: p.color || "#FF0000",
-            intensity: p.intensity ?? 1,
-        }))
-    },
-    schema: SendVibrationSchema,
+    ctx.user.currentRoom.broadcast(JSON.stringify({
+        message: "receieve_touch",
+        id: ctx.user.id + "_" + p.id,
+        type: p.type,
+        user: {
+            username: ctx.user.username,
+            id: ctx.user.id,
+        },
+        color: p.color || "#FF0000",
+        intensity: p.intensity ?? 1,
+    }))
 }
-
-export default SendVibrationRoute;

server/src/socket/routes/set_username.ts

@@ -1,25 +1,19 @@
 import { z } from "zod";
 import { Context, Route } from "../hapticLinkServer";
 
-interface SetUsernamePayload {
+export interface SetUsernamePayload {
     username: string;
 }
-const SetUsernameSchema = z.object({
+export const SetUsernameSchema = z.object({
     username: z.string(),
 })
 
-const SetUsernameRoute: Route<SetUsernamePayload> = {
-    name: "set_username",
-    handler: function(ctx: Context<SetUsernamePayload>) {
+export function SetUsernameHandler(ctx: Context<SetUsernamePayload>) {
+    ctx.user.username = ctx.payload.username;
 
-        ctx.user.username = ctx.payload.username;
-
-        return ctx.ws.send(JSON.stringify({
-            "message": "set_username_response",
-            "status": "success"
-        }))
-    },
-    schema: SetUsernameSchema,
+    return ctx.ws.send(JSON.stringify({
+        "message": "set_username_response",
+        "status": "success"
+    }))
 }
 
-export default SetUsernameRoute;

server/src/socket/routes/test_connection.ts

@@ -1,25 +1,20 @@
 import { z } from "zod";
 import { Context, Route } from "../hapticLinkServer";
 
-interface TestConnectionPayload { }
-const TestConnnectionSchema = z.object({})
+export interface TestConnectionPayload { }
+export const TestConnnectionSchema = z.object({})
 
-const TestConnectionRoute: Route<TestConnectionPayload> = {
-    name: "test_connection",
-    handler: function (ctx: Context<TestConnectionPayload>) {
-        if (ctx.user) {
-            return ctx.ws.send(JSON.stringify({
-                "message": "test_connection_response",
-                "authenticated": true,
-                "username": ctx.user.username
-            }))
-        }
+export function TestConnectionHandler(ctx: Context<TestConnectionPayload>) {
+    if (ctx.user) {
         return ctx.ws.send(JSON.stringify({
             "message": "test_connection_response",
-            "authenticated": false,
+            "authenticated": true,
+            "username": ctx.user.username
         }))
-    },
-    schema: TestConnnectionSchema,
+    }
+    return ctx.ws.send(JSON.stringify({
+        "message": "test_connection_response",
+        "authenticated": false,
+    }))
 }
 
-export default TestConnectionRoute;