atom.io 0.46.9 → 0.46.11

package/src/realtime-react/use-realtime-rooms.ts

@@ -3,56 +3,59 @@ import { findInStore, getInternalRelationsFromStore } from "atom.io/internal"
 import { StoreContext, useO } from "atom.io/react"
 import type { RoomKey, RoomSocketInterface, UserKey } from "atom.io/realtime"
 import { ownersOfRooms, roomKeysAtom, usersInRooms } from "atom.io/realtime"
+import { myUserKeyAtom } from "atom.io/realtime-client"
 import type { UList } from "atom.io/transceivers/u-list"
 import * as React from "react"
 import type { Socket } from "socket.io-client"
 
 import { RealtimeContext } from "./realtime-context"
+import { usePullAtom } from "./use-pull-atom"
 import { usePullMutable } from "./use-pull-mutable-atom"
 import { usePullMutableAtomFamilyMember } from "./use-pull-mutable-family-member"
 
 export type RealtimeRoomsTools = {
-	socket: Socket<{}, RoomSocketInterface<string>>
+	roomSocket: Socket<{}, RoomSocketInterface<string>>
 	myRoomKey: RoomKey | undefined
 	myMutualsAtom: MutableAtomToken<UList<UserKey>>
 	myOwnedRoomsAtom: MutableAtomToken<UList<RoomKey>>
 	allRoomKeysAtom: MutableAtomToken<UList<RoomKey>>
 }
-export function useRealtimeRooms<RoomNames extends string>(
-	userKey: UserKey,
-): RealtimeRoomsTools {
+export function useRealtimeRooms<
+	RoomNames extends string,
+>(): RealtimeRoomsTools {
 	const store = React.useContext(StoreContext)
 	const { socket } = React.useContext(RealtimeContext)
 	usePullMutable(roomKeysAtom)
+	const userKey = usePullAtom(myUserKeyAtom) ?? `user::$_NONE_$`
 
 	const [userKeysFamily, roomKeysFamily] = getInternalRelationsFromStore(
 		store,
 		usersInRooms,
 		`split`,
 	)
-
 	usePullMutableAtomFamilyMember(roomKeysFamily, userKey)
+
 	const myJoinedRoomKeys = useO(roomKeysFamily, userKey)
 	let myRoomKey: RoomKey | undefined
 	for (const roomKey of myJoinedRoomKeys) {
 		myRoomKey = roomKey
 		break
 	}
-
 	const roomKey = myRoomKey ?? `room::$_NONE_$`
 	const myMutualsAtom = findInStore(store, userKeysFamily, roomKey)
 	usePullMutableAtomFamilyMember(userKeysFamily, roomKey)
 
-	const [ownedRoomsFamily] = getInternalRelationsFromStore(
+	const [ownedRoomsFamily, roomOwnersFamily] = getInternalRelationsFromStore(
 		store,
 		ownersOfRooms,
 		`split`,
 	)
 	const myOwnedRoomsAtom = findInStore(store, ownedRoomsFamily, userKey)
 	usePullMutableAtomFamilyMember(ownedRoomsFamily, userKey)
+	usePullMutableAtomFamilyMember(roomOwnersFamily, roomKey)
 
 	return {
-		socket: socket as Socket<{}, RoomSocketInterface<RoomNames>>,
+		roomSocket: socket as Socket<{}, RoomSocketInterface<RoomNames>>,
 		myRoomKey,
 		allRoomKeysAtom: roomKeysAtom,
 		myMutualsAtom,

package/src/realtime-server/ipc-sockets/parent-socket.ts

@@ -19,7 +19,7 @@ export class SubjectSocket<
 	public in: Subject<EventPayload<I>>
 	public out: Subject<EventPayload<O>>
 	public id = `no_id_retrieved`
-	public disposalFunctions: (() => void)[] = []
+	public disposalEffects: (() => void)[] = []
 
 	public constructor(id: string) {
 		super((...args) => {
@@ -35,7 +35,7 @@ export class SubjectSocket<
 	}
 
 	public dispose(): void {
-		for (const dispose of this.disposalFunctions) {
+		for (const dispose of this.disposalEffects) {
 			dispose()
 		}
 	}
@@ -179,6 +179,19 @@ export class ParentSocket<
 			this.logger.info(`👤`, userKey, `joined`)
 			const existingRelay = this.relays.get(userKey)
 			if (existingRelay) {
+				this.logger.info(`🔗`, `reattaching relay services for`, userKey)
+				const cleanupRelay = this.initRelay(existingRelay, userKey)
+				if (cleanupRelay) {
+					existingRelay.disposalEffects.push(cleanupRelay)
+				}
+				this.on(userKey, (...data) => {
+					relay.in.next(data)
+				})
+				existingRelay.disposalEffects.push(
+					existingRelay.out.subscribe(`socket`, (data) => {
+						this.emit(userKey, ...(data as any))
+					}),
+				)
 				return
 			}
 			const relay = new SubjectSocket(userKey)
@@ -186,12 +199,12 @@ export class ParentSocket<
 			this.logger.info(`🔗`, `attaching relay services for`, userKey)
 			const cleanupRelay = this.initRelay(relay, userKey)
 			if (cleanupRelay) {
-				relay.disposalFunctions.push(cleanupRelay)
+				relay.disposalEffects.push(cleanupRelay)
 			}
 			this.on(userKey, (...data) => {
 				relay.in.next(data)
 			})
-			relay.disposalFunctions.push(
+			relay.disposalEffects.push(
 				relay.out.subscribe(`socket`, (data) => {
 					this.emit(userKey, ...(data as any))
 				}),

package/src/realtime-server/provide-rooms.ts

@@ -191,10 +191,17 @@ export function provideEnterAndExit({
 			roomSocket.on(`joinRoom`, enterRoom)
 		}
 
-		editRelationsInStore(store, usersInRooms, (relations) => {
-			relations.set({ room: roomKey, user: userKey })
-		})
+		const userIsAlreadyInRoom = getFromStore(
+			store,
+			getInternalRelationsFromStore(store, usersInRooms),
+			roomKey,
+		).has(userKey as any)
 
+		if (!userIsAlreadyInRoom) {
+			editRelationsInStore(store, usersInRooms, (relations) => {
+				relations.set({ room: roomKey, user: userKey })
+			})
+		}
 		childSocket.emit(`user-joins`, userKey)
 
 		toRoom = (payload) => {