wind-explorer/friendolls-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolidated event subscription listeners into one

Browse Source
This commit is contained in:
Adam C
2026-03-08 11:47:32 +08:00
parent 3a3ea3498b
commit 291e0311e8
7 changed files with 64 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/events/friend-cursor.ts
View File

@@ -3,12 +3,10 @@ import {
events,
type CursorPositions,
type DollDto,
type FriendActiveDollChangedPayload,
type FriendDisconnectedPayload,
type OutgoingFriendCursorPayload,
} from "$lib/bindings";
import {
createMultiListenerSubscription,
createListenersSubscription,
removeFromStore,
setupHmrCleanup,
} from "./listener-utils";
@@ -23,7 +21,7 @@ export const friendsCursorPositions = writable<Record<string, CursorPositions>>(
);
export const friendsActiveDolls = writable<Record<string, DollDto | null>>({});
const subscription = createMultiListenerSubscription();
const subscription = createListenersSubscription();
let friendCursorState: Record<string, FriendCursorData> = {};
@@ -37,8 +35,8 @@ export async function startFriendCursorTracking() {
try {
// TODO: Add initial sync for existing friends' cursors and dolls if needed
const unlistenFriendCursor = await events.friendCursorPositionUpdated.listen(
(event) => {
const unlistenFriendCursor =
await events.friendCursorPositionUpdated.listen((event) => {
const data: OutgoingFriendCursorPayload = event.payload;
friendCursorState[data.userId] = {
@@ -52,8 +50,7 @@ export async function startFriendCursorTracking() {
[data.userId]: data.position,
};
});
},
);
});
subscription.addUnlisten(unlistenFriendCursor);
const unlistenFriendDisconnected = await events.friendDisconnected.listen(
@@ -72,30 +69,28 @@ export async function startFriendCursorTracking() {
subscription.addUnlisten(unlistenFriendDisconnected);
const unlistenFriendActiveDollChanged =
await events.friendActiveDollChanged.listen(
(event) => {
const payload = event.payload;
await events.friendActiveDollChanged.listen((event) => {
const payload = event.payload;
if (!payload.doll) {
friendsActiveDolls.update((current) => {
const next = { ...current };
next[payload.friendId] = null;
return next;
});
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,
};
});
}
},
);
friendsCursorPositions.update((current) =>
removeFromStore(current, payload.friendId),
);
} else {
friendsActiveDolls.update((current) => {
return {
...current,
[payload.friendId]: payload.doll,
};
});
}
});
subscription.addUnlisten(unlistenFriendActiveDollChanged);
subscription.setListening(true);