fixed WS race condition issue

src/events/cursor.ts

@@ -25,7 +25,9 @@ type FriendCursorData = {
 // The exported store will only expose the position part to consumers,
 // but internally we manage the full data.
 // Actually, it's easier if we just export the positions and manage state internally.
-export let friendsCursorPositions = writable<Record<string, CursorPositions>>({});
+export let friendsCursorPositions = writable<Record<string, CursorPositions>>(
+  {},
+);
 export let friendsActiveDolls = writable<Record<string, DollDto | null>>({});
 
 let unlistenCursor: UnlistenFn | null = null;
@@ -90,10 +92,7 @@ export async function initCursorTracking() {
           try {
             payload = JSON.parse(payload);
           } catch (e) {
-            console.error(
-              "[Cursor] Failed to parse friend disconnected payload:",
-              e,
-            );
+            console.error("Failed to parse friend disconnected payload:", e);
             return;
           }
         }
@@ -129,7 +128,7 @@ export async function initCursorTracking() {
           data = JSON.parse(data);
         } catch (e) {
           console.error(
-            "[Cursor] Failed to parse friend-active-doll-changed payload:",
+            "Failed to parse friend-active-doll-changed payload:",
             e,
           );
           return;
@@ -139,16 +138,8 @@ export async function initCursorTracking() {
       // Cast to expected type after parsing
       const payload = data as { friendId: string; doll: DollDto | null };
 
-      console.log(
-        "[Cursor] Received friend-active-doll-changed event:",
-        payload,
-      );
-
       if (!payload.doll) {
         // If doll is null, it means the friend deactivated their doll.
-        console.log(
-          `[Cursor] Removing doll for friend ${payload.friendId} due to deactivation`,
-        );
 
         // Update the active dolls store to explicitly set this friend's doll to null
         // We MUST set it to null instead of deleting it, otherwise the UI might
@@ -167,10 +158,6 @@ export async function initCursorTracking() {
         });
       } else {
         // Update or add the new doll configuration
-        console.log(
-          `[Cursor] Updating doll for friend ${payload.friendId}:`,
-          payload.doll,
-        );
         friendsActiveDolls.update((current) => {
           return {
             ...current,
@@ -182,7 +169,7 @@ export async function initCursorTracking() {
 
     isListening = true;
   } catch (err) {
-    console.error("[Cursor] Failed to initialize cursor tracking:", err);
+    console.error("Failed to initialize cursor tracking:", err);
     throw err;
   }
 }

src/routes/+layout.svelte

@@ -11,7 +11,7 @@
         await initCursorTracking();
         await initAppDataListener();
       } catch (err) {
-        console.error("[Scene] Failed to initialize event listeners:", err);
+        console.error("Failed to initialize event listeners:", err);
       }
     });
 

src/routes/scene/+page.svelte

@@ -17,15 +17,12 @@
   }
 
   function getFriendDollConfig(userId: string) {
-      // 1. Try to get from real-time store (most up-to-date)
-      // Check if key exists to distinguish between "unknown" (undefined) and "no doll" (null)
-      if (userId in $friendsActiveDolls) {
-          return $friendsActiveDolls[userId]?.configuration;
-      }
-      
-      // 2. Fallback to initial app data (snapshot on load)
-      const friend = $appData?.friends?.find((f) => f.friend.id === userId);
-      return friend?.friend.activeDoll?.configuration;
+    if (userId in $friendsActiveDolls) {
+      return $friendsActiveDolls[userId]?.configuration;
+    }
+
+    const friend = $appData?.friends?.find((f) => f.friend.id === userId);
+    return friend?.friend.activeDoll?.configuration;
   }
 </script>
 
@@ -55,6 +52,7 @@
           <p class="text-sm font-semibold opacity-75">Friends Online</p>
           <div>
             {#each Object.entries($friendsCursorPositions) as [userId, position]}
+              {@const dollConfig = getFriendDollConfig(userId)}
               <div
                 class="bg-base-200/50 p-2 rounded text-xs text-left flex gap-2 flex-col"
               >