moved friend cursor data aggregation from frontend to backend

src/events/friend-cursor.ts

@@ -1,81 +1,32 @@
 import { writable } from "svelte/store";
-import {
-  events,
-  type CursorPositions,
-  type DollDto,
-  type OutgoingFriendCursorPayload,
-} from "$lib/bindings";
-import { createEventSource, removeFromStore } from "./listener-utils";
-
-type FriendCursorData = {
-  position: CursorPositions;
-  lastUpdated: number;
-};
+import { events, type CursorPositions } from "$lib/bindings";
+import { createEventSource } from "./listener-utils";
 
 export const friendsCursorPositions = writable<Record<string, CursorPositions>>(
   {},
 );
-export const friendsActiveDolls = writable<Record<string, DollDto | null>>({});
+
+// Here for now. Will extract into shared
+// util when there's more similar cases.
+function toCursorPositionsRecord(
+  payload: Partial<Record<string, CursorPositions>>,
+): Record<string, CursorPositions> {
+  return Object.fromEntries(
+    Object.entries(payload).filter(
+      (entry): entry is [string, CursorPositions] => {
+        return entry[1] !== undefined;
+      },
+    ),
+  );
+}
 
 export const {
   start: startFriendCursorTracking,
   stop: stopFriendCursorTracking,
 } = createEventSource(async (addEventListener) => {
-  let friendCursorState: Record<string, FriendCursorData> = {};
   addEventListener(
-    await events.friendCursorPositionUpdated.listen((event) => {
-      const data: OutgoingFriendCursorPayload = event.payload;
-
-      friendCursorState[data.userId] = {
-        position: data.position,
-        lastUpdated: Date.now(),
-      };
-
-      friendsCursorPositions.update((current) => {
-        return {
-          ...current,
-          [data.userId]: data.position,
-        };
-      });
-    }),
-  );
-
-  addEventListener(
-    await events.friendDisconnected.listen((event) => {
-      const data = event.payload;
-
-      if (friendCursorState[data.userId]) {
-        delete friendCursorState[data.userId];
-      }
-
-      friendsCursorPositions.update((current) =>
-        removeFromStore(current, data.userId),
-      );
-    }),
-  );
-
-  addEventListener(
-    await events.friendActiveDollChanged.listen((event) => {
-      const payload = event.payload;
-
-      if (!payload.doll) {
-        friendsActiveDolls.update((current) => {
-          const next = { ...current };
-          next[payload.friendId] = null;
-          return next;
-        });
-
-        friendsCursorPositions.update((current) =>
-          removeFromStore(current, payload.friendId),
-        );
-      } else {
-        friendsActiveDolls.update((current) => {
-          return {
-            ...current,
-            [payload.friendId]: payload.doll,
-          };
-        });
-      }
+    await events.friendCursorPositionsUpdated.listen((event) => {
+      friendsCursorPositions.set(toCursorPositionsRecord(event.payload));
     }),
   );
 });

src/lib/bindings.ts

@@ -130,7 +130,7 @@ createDoll: CreateDoll,
 cursorMoved: CursorMoved,
 editDoll: EditDoll,
 friendActiveDollChanged: FriendActiveDollChanged,
-friendCursorPositionUpdated: FriendCursorPositionUpdated,
+friendCursorPositionsUpdated: FriendCursorPositionsUpdated,
 friendDisconnected: FriendDisconnected,
 friendRequestAccepted: FriendRequestAccepted,
 friendRequestDenied: FriendRequestDenied,
@@ -148,7 +148,7 @@ createDoll: "create-doll",
 cursorMoved: "cursor-moved",
 editDoll: "edit-doll",
 friendActiveDollChanged: "friend-active-doll-changed",
-friendCursorPositionUpdated: "friend-cursor-position-updated",
+friendCursorPositionsUpdated: "friend-cursor-positions-updated",
 friendDisconnected: "friend-disconnected",
 friendRequestAccepted: "friend-request-accepted",
 friendRequestDenied: "friend-request-denied",
@@ -182,7 +182,8 @@ export type DollDto = { id: string; name: string; configuration: DollConfigurati
 export type EditDoll = string
 export type FriendActiveDollChanged = FriendActiveDollChangedPayload
 export type FriendActiveDollChangedPayload = { friendId: string; doll: DollDto | null }
-export type FriendCursorPositionUpdated = OutgoingFriendCursorPayload
+export type FriendCursorPositionsDto = Partial<{ [key in string]: CursorPositions }>
+export type FriendCursorPositionsUpdated = FriendCursorPositionsDto
 export type FriendDisconnected = FriendDisconnectedPayload
 export type FriendDisconnectedPayload = { userId: string }
 export type FriendRequestAccepted = FriendRequestAcceptedPayload
@@ -200,10 +201,6 @@ export type InteractionDeliveryFailedDto = { recipientUserId: string; reason: st
 export type InteractionPayloadDto = { senderUserId: string; senderName: string; content: string; type: string; timestamp: string }
 export type InteractionReceived = InteractionPayloadDto
 export type ModuleMetadata = { id: string; name: string; version: string; description: string | null }
-/**
- * Outgoing friend cursor position to frontend
- */
-export type OutgoingFriendCursorPayload = { userId: string; position: CursorPositions }
 export type PresenceStatus = { title: string | null; subtitle: string | null; graphicsB64: string | null }
 export type SceneData = { display: DisplayData; grid_size: number }
 export type SceneInteractiveChanged = boolean