Removed multiroom thing and added send_vibration

server/README.md

@@ -154,7 +154,7 @@ Room messages are sent to everyone in a room
 ## Send Touch
 
 **Type:** `client -> server`  
-**Description:** Used to send touch/vibration data to room. Client assigns a number for an ID. That ID is then used to update the vibration. Re-use `send_touch` to update previous vibration. Use `"type": "disable"` to disable the vibration. If an update isn't sent within 1 second of creatin/last update it will automatically be disabled.  
+**Description:** Used to send touch/vibration data to room. Client assigns a number for an ID. That ID is then used to update the vibration. Re-use `send_touch` to update previous vibration. Use `"type": "disable"` to disable the vibration. If an update isn't sent within 1 second of creation/last update it will automatically be disabled.  
 **Payload:**  
 
 ```typescript

server/src/socket/hapticLinkServer.ts

@@ -16,12 +16,10 @@ export class User {
     username?: string;
     socket: WebSocket;
     currentRoom?: Room;
-    rooms: Room[];
 
     constructor(socket: WebSocket) {
         this.id = generateSessionToken(16);
         this.socket = socket;
-        this.rooms = [];
     }
 }
 
@@ -46,10 +44,9 @@ export class HapticLinkServer {
     removeUser(ws: WebSocket): boolean {
         const user = this.users.get(ws);
         if (!user) return false;
-        user.rooms.forEach((room) => {
-            room.removeUserById(user.id);
-        })
-
+        if (user.currentRoom) {
+            user.currentRoom.removeUserById(user.id);
+        }
         return true;
     }
 

server/src/socket/room.ts

@@ -17,8 +17,8 @@ export class Room {
     }
 
     addUser(user: User) {
+        // Generate random roomId if one wasn't created.
         this.users.push(user);
-        user.rooms.push(this);
         this.updateRoom();
     }
 

server/src/socket/routes.ts

@@ -1,12 +1,12 @@
 import { HapticLinkServer } from "./hapticLinkServer";
-import GetRoomsRoute from "./routes/get_rooms";
 import JoinRoomRoute from "./routes/join_room";
 import LeaveRoomRoute from "./routes/leave_room";
+import SendVibrationRoute from "./routes/send_vibration";
 import TestConnectionRoute from "./routes/test_connection";
 
 export function registerRoutes(router: HapticLinkServer) {
     router.addRoute(TestConnectionRoute);
     router.addRoute(JoinRoomRoute);
     router.addRoute(LeaveRoomRoute);
-    router.addRoute(GetRoomsRoute);
+    router.addRoute(SendVibrationRoute);
 }

server/src/socket/routes/get_rooms.ts

@@ -1,30 +0,0 @@
-import { z } from "zod";
-import { Context, Route } from "../hapticLinkServer";
-
-interface GetRoomsPayload {}
-const GetRoomsSchema = z.object({})
-
-interface RoomData {
-    id: string;
-    userCount: number;
-}
-
-const GetRoomsRoute: Route<GetRoomsPayload> = {
-    name: "get_rooms",
-    handler: function(ctx: Context<GetRoomsPayload>) {
-        let rooms: RoomData[] = [];
-        ctx.user.rooms.forEach((room) => {
-            rooms.push({
-                id: room.id,
-                userCount: room.users.length
-            })
-        })
-        return ctx.ws.send(JSON.stringify({
-            "message": "get_rooms_response",
-            "rooms": rooms,
-        }))
-    },
-    schema: GetRoomsSchema,
-}
-
-export default GetRoomsRoute;

server/src/socket/routes/join_room.ts

@@ -20,13 +20,6 @@ const JoinRoomRoute: Route<JoinRoomPayload> = {
             ctx.user.username = ctx.payload.username;
         }
 
-        if (ctx.user.rooms.length > 4) {
-            return ctx.ws.send(JSON.stringify({
-                message: "join_room_response",
-                status: "you are already part of 5 groups. leave one to join another."
-            }))
-        }
-
         let room: Room;
 
         if (ctx.payload.roomId && !ctx.server.rooms[ctx.payload.roomId]) {
@@ -40,6 +33,8 @@ const JoinRoomRoute: Route<JoinRoomPayload> = {
             room = ctx.server.rooms[ctx.payload.roomId]
         }
 
+        ctx.user.currentRoom = room;
+
         // Broadcasts message to room
         room.addUser(ctx.user);
     },

server/src/socket/routes/leave_room.ts

@@ -12,9 +12,7 @@ const LeaveRoomSchema = z.object({
 const LeaveRoomRoute: Route<LeaveRoomPayload> = {
     name: "leave_room",
     handler: function(ctx: Context<LeaveRoomPayload>) {
-        const room = ctx.user.rooms.find((r) => {
-            return ctx.payload.roomId == r.id;
-        })
+        const room = ctx.user.currentRoom;
 
         if (!room) {
             return ctx.ws.send(JSON.stringify({
@@ -23,9 +21,6 @@ const LeaveRoomRoute: Route<LeaveRoomPayload> = {
             }))
         } else {
             room.removeUserById(ctx.user.id);
-            ctx.user.rooms = ctx.user.rooms.filter((r) => {
-                return r != room
-            })
             return ctx.ws.send(JSON.stringify({
                 message: "leave_room_response",
                 status: "room left"

server/src/socket/routes/send_vibration.ts

@@ -0,0 +1,53 @@
+import { z } from "zod";
+import { Context, Route } from "../hapticLinkServer";
+
+interface SendVibrationPayload {
+    id: number;
+    type: "enabled" | "disabled";
+    position: {
+        x: number,
+        y: number,
+    };
+    color?: string;
+    intensity?: number;
+}
+
+const SendVibrationSchema = z.object({
+    id: z.number(),
+    type: z.union([z.literal("enabled"), z.literal("disabled")]),
+    position: z.object({
+        x: z.number(),
+        y: z.number(),
+    }),
+    color: z.string().optional(),
+    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",
+            }))
+        }
+
+        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,
+}
+
+export default SendVibrationRoute;