atom.io 0.46.10 → 0.46.12

package/src/realtime-client/realtime-client-stores/client-main-store.ts

@@ -1,52 +1,44 @@
-import * as AtomIO from "atom.io"
-import {
-	type RoomKey,
-	type SocketKey,
-	type UserKey,
-	usersInRooms,
-} from "atom.io/realtime"
+import type { ReadonlyPureSelectorToken, RegularAtomToken } from "atom.io"
+import { atom, getInternalRelations, selector } from "atom.io"
+import type { RoomKey, SocketKey, UserKey } from "atom.io/realtime"
+import { usersInRooms } from "atom.io/realtime"
 
-export const mySocketKeyAtom: AtomIO.RegularAtomToken<SocketKey | undefined> =
-	AtomIO.atom<SocketKey | undefined>({
-		key: `mySocketKey`,
-		default: undefined,
-	})
+export const mySocketKeyAtom: RegularAtomToken<SocketKey | undefined> = atom({
+	key: `mySocketKey`,
+	default: undefined,
+})
 
-export const myUserKeyAtom: AtomIO.RegularAtomToken<UserKey | null> =
-	AtomIO.atom<UserKey | null>({
-		key: `myUserKey`,
-		default: null,
-		effects: [
-			(userKey) => {
-				if (typeof window !== `undefined`) {
-					void import(`atom.io/web`).then(({ storageSync }) => {
-						storageSync(globalThis.localStorage, JSON, `myUserKey`)(userKey)
-					})
-				}
-			},
-		],
-	})
+export const myUserKeyAtom: RegularAtomToken<UserKey | null> = atom({
+	key: `myUserKey`,
+	default: null,
+	effects: [
+		(userKey) => {
+			if (typeof window !== `undefined`) {
+				void import(`atom.io/web`).then(({ storageSync }) => {
+					storageSync(globalThis.localStorage, JSON, `myUserKey`)(userKey)
+				})
+			}
+		},
+	],
+})
 
-export const myRoomKeySelector: AtomIO.ReadonlyPureSelectorToken<RoomKey | null> =
-	AtomIO.selector<RoomKey | null>({
+export const myRoomKeySelector: ReadonlyPureSelectorToken<RoomKey | null> =
+	selector({
 		key: `myRoomKey`,
 		get: ({ get }) => {
 			if (
-				`env` in globalThis &&
-				`REALTIME_ROOM_KEY` in (globalThis as any).env
+				`process` in globalThis &&
+				`env` in process &&
+				`REALTIME_ROOM_KEY` in process.env
 			) {
 				// if a room running server-side wants its own key, this is where it lives
-				return (globalThis as any).env[`REALTIME_ROOM_KEY`]
+				return process.env[`REALTIME_ROOM_KEY`] as RoomKey
 			}
 			const myUserKey = get(myUserKeyAtom)
 			if (!myUserKey) return null
-			const [, usersInRoomsAtoms] = AtomIO.getInternalRelations(
-				usersInRooms,
-				`split`,
-			)
+			const [, usersInRoomsAtoms] = getInternalRelations(usersInRooms, `split`)
 			const roomKeys = get(usersInRoomsAtoms, myUserKey)
-			for (const roomKey of roomKeys) {
-				return roomKey
-			}
+			for (const roomKey of roomKeys) return roomKey
+			return null
 		},
 	})

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) => {