@emeryld/rrroutes-client 2.2.12 → 2.2.14

package/dist/index.mjs

@@ -751,72 +751,84 @@ function normalizeRooms(rooms) {
   }
   return normalized;
 }
+function mergeRoomState(prev, toRoomsResult) {
+  const merged = new Set(prev.rooms);
+  for (const r of normalizeRooms(toRoomsResult.rooms)) merged.add(r);
+  return {
+    rooms: Array.from(merged),
+    joinMeta: toRoomsResult.joinMeta ?? prev.joinMeta,
+    leaveMeta: toRoomsResult.leaveMeta ?? prev.leaveMeta
+  };
+}
 function roomsFromData(data, toRooms) {
-  if (data == null) return [];
-  const merge = /* @__PURE__ */ new Set();
+  if (data == null) return { rooms: [] };
+  let state = { rooms: [] };
   const add = (input) => {
-    for (const r of normalizeRooms(input)) merge.add(r);
+    state = mergeRoomState(state, toRooms(input));
   };
   const maybePages = data?.pages;
   if (Array.isArray(maybePages)) {
-    for (const page of maybePages) add(toRooms(page));
-    return Array.from(merge);
+    for (const page of maybePages) add(page);
+    return state;
   }
-  add(toRooms(data));
-  return Array.from(merge);
+  add(data);
+  return state;
 }
 function buildSocketedRoute(options) {
-  const { built, event, toRooms, applyMessage, joinMeta, leaveMeta, useSocketClient: useSocketClient2 } = options;
+  const { built, toRooms, applySocket, useSocketClient: useSocketClient2 } = options;
   return (...useArgs) => {
     const client = useSocketClient2();
     const endpointResult = built.useEndpoint(...useArgs);
     const argsKey = useMemo2(() => JSON.stringify(useArgs[0] ?? null), [useArgs]);
-    const [rooms, setRooms] = useState2(
+    const [roomState, setRoomState] = useState2(
       () => roomsFromData(endpointResult.data, toRooms)
     );
-    const roomsKey = useMemo2(() => rooms.join("|"), [rooms]);
+    const roomsKey = useMemo2(() => roomState.rooms.join("|"), [roomState.rooms]);
+    const joinMetaKey = useMemo2(() => JSON.stringify(roomState.joinMeta ?? null), [roomState.joinMeta]);
+    const leaveMetaKey = useMemo2(() => JSON.stringify(roomState.leaveMeta ?? null), [roomState.leaveMeta]);
     useEffect2(() => {
       const unsubscribe = endpointResult.onReceive((data) => {
-        setRooms((prev) => {
-          const next = normalizeRooms(toRooms(data));
-          if (next.length === 0) return prev;
-          const merged = new Set(prev);
-          next.forEach((r) => merged.add(r));
-          return Array.from(merged);
-        });
+        setRoomState((prev) => mergeRoomState(prev, toRooms(data)));
       });
       return unsubscribe;
     }, [endpointResult, toRooms]);
     useEffect2(() => {
-      setRooms(roomsFromData(endpointResult.data, toRooms));
+      setRoomState(roomsFromData(endpointResult.data, toRooms));
     }, [endpointResult.data, toRooms]);
     useEffect2(() => {
-      if (rooms.length === 0) return;
+      if (roomState.rooms.length === 0) return;
+      const { joinMeta, leaveMeta } = roomState;
+      if (!joinMeta || !leaveMeta) return;
       let active = true;
       (async () => {
         try {
-          await client.joinRooms(rooms, joinMeta);
+          await client.joinRooms(roomState.rooms, joinMeta);
         } catch {
         }
       })();
       return () => {
-        if (!active || rooms.length === 0) return;
+        if (!active || roomState.rooms.length === 0) return;
         active = false;
-        void client.leaveRooms(rooms, leaveMeta).catch(() => {
+        void client.leaveRooms(roomState.rooms, leaveMeta).catch(() => {
         });
       };
-    }, [client, joinMeta, leaveMeta, roomsKey]);
+    }, [client, roomsKey, roomState.joinMeta, roomState.leaveMeta, joinMetaKey, leaveMetaKey]);
     useEffect2(() => {
-      const unsubscribe = client.on(event, (payload, meta) => {
-        built.setData((prev) => {
-          const next = applyMessage(prev, payload, meta);
-          setRooms(roomsFromData(next, toRooms));
-          return next;
-        }, ...useArgs);
-      });
-      return unsubscribe;
-    }, [client, event, applyMessage, built, argsKey]);
-    return { ...endpointResult, rooms };
+      const entries = Object.entries(applySocket).filter(
+        ([_event, fn]) => typeof fn === "function"
+      );
+      const unsubscribes = entries.map(
+        ([ev, fn]) => client.on(ev, (payload, meta) => {
+          built.setData((prev) => {
+            const next = fn(prev, payload, meta);
+            setRoomState(roomsFromData(next, toRooms));
+            return next;
+          }, ...useArgs);
+        })
+      );
+      return () => unsubscribes.forEach((u) => u?.());
+    }, [client, applySocket, built, argsKey, toRooms]);
+    return { ...endpointResult, rooms: roomState.rooms };
   };
 }