atom.io 0.44.5 → 0.44.7

package/src/realtime-server/realtime-server-stores/server-user-store.ts

@@ -6,13 +6,10 @@ import type {
 	RegularAtomFamilyToken,
 } from "atom.io"
 import { atomFamily, join, mutableAtom, selectorFamily } from "atom.io"
-import type { Socket } from "atom.io/realtime"
+import type { RoomKey, Socket, SocketKey, UserKey } from "atom.io/realtime"
+import { isSocketKey, isUserKey } from "atom.io/realtime"
 import { UList } from "atom.io/transceivers/u-list"
 
-export type SocketKey = `socket::${string}`
-export type UserKey = `user::${string}`
-export type RoomKey = `room::${string}`
-
 export type SocketSystemHierarchy = Hierarchy<
 	[
 		{
@@ -28,13 +25,13 @@ export const socketAtoms: RegularAtomFamilyToken<Socket | null, SocketKey> =
 		default: null,
 	})
 
-export const socketIndex: MutableAtomToken<UList<SocketKey>> = mutableAtom<
+export const socketKeysAtom: MutableAtomToken<UList<SocketKey>> = mutableAtom<
 	UList<SocketKey>
 >({
 	key: `socketsIndex`,
 	class: UList,
 })
-export const userIndex: MutableAtomToken<UList<UserKey>> = mutableAtom<
+export const userKeysAtom: MutableAtomToken<UList<UserKey>> = mutableAtom<
 	UList<UserKey>
 >({
 	key: `usersIndex`,
@@ -50,16 +47,12 @@ export const usersOfSockets: JoinToken<
 	key: `usersOfSockets`,
 	between: [`user`, `socket`],
 	cardinality: `1:1`,
-	isAType: (s): s is UserKey => s.startsWith(`user::`),
-	isBType: (s): s is SocketKey => s.startsWith(`socket::`),
+	isAType: isUserKey,
+	isBType: isSocketKey,
 })
 
-export const userMutualSituationalAwarenessIndexes: PureSelectorFamilyToken<
-	UserKey[],
-	UserKey
-> = selectorFamily<UserKey[], UserKey>({
-	key: `userMutualSituationalAwarenessIndexes`,
-	get: (userId) => () => {
-		return [userId]
-	},
-})
+export const selfListSelectors: PureSelectorFamilyToken<UserKey[], UserKey> =
+	selectorFamily<UserKey[], UserKey>({
+		key: `selfList`,
+		get: (userId) => () => [userId],
+	})

package/src/realtime-testing/setup-realtime-test.tsx

@@ -16,6 +16,7 @@ import {
 } from "atom.io/internal"
 import { toEntries } from "atom.io/json"
 import * as AR from "atom.io/react"
+import type * as RT from "atom.io/realtime"
 import * as RTC from "atom.io/realtime-client"
 import * as RTR from "atom.io/realtime-react"
 import * as RTS from "atom.io/realtime-server"
@@ -71,7 +72,7 @@ export type TestSetupOptions = {
 	server: (tools: {
 		socket: SocketIO.Socket
 		silo: AtomIO.Silo
-		userKey: RTS.UserKey
+		userKey: RT.UserKey
 		enableLogging: () => void
 	}) => (() => void) | void
 }
@@ -141,7 +142,7 @@ export const setupRealtimeTestServer = (
 	const server = new SocketIO.Server(httpServer).use((socket, next) => {
 		const { token, username } = socket.handshake.auth
 		if (token === `test` && socket.id) {
-			const userClaim = socketRealm.allocate(`root`, `user::${username}`)
+			const userClaim = socketRealm.allocate(`root`, username as RT.UserKey)
 			const socketClaim = socketRealm.allocate(`root`, `socket::${socket.id}`)
 			const socketState = findInStore(silo.store, RTS.socketAtoms, socketClaim)
 			setIntoStore(silo.store, socketState, socket)
@@ -152,8 +153,8 @@ export const setupRealtimeTestServer = (
 				},
 				silo.store,
 			)
-			setIntoStore(silo.store, RTS.userIndex, (index) => index.add(userClaim))
-			setIntoStore(silo.store, RTS.socketIndex, (index) =>
+			setIntoStore(silo.store, RTS.userKeysAtom, (index) => index.add(userClaim))
+			setIntoStore(silo.store, RTS.socketKeysAtom, (index) =>
 				index.add(socketClaim),
 			)
 			next()
@@ -228,13 +229,13 @@ export const setupRealtimeTestClient = (
 	const testClient = { dispose: () => {} }
 	const init = () => {
 		const socket: ClientSocket = io(`http://localhost:${port}/`, {
-			auth: { token: `test`, username: `${name}-${testNumber}` },
+			auth: { token: `test`, username: `user::${name}-${testNumber}` },
 		})
 		const silo = new AtomIO.Silo(
 			{ name, lifespan: `ephemeral`, isProduction: false },
 			IMPLICIT.STORE,
 		)
-		silo.setState(RTC.myUsernameState, `${name}-${testNumber}`)
+		silo.setState(RTC.myUserKeyAtom, `user::${name}-${testNumber}`)
 
 		const { document } = new Happy.Window()
 		document.body.innerHTML = `<div id="app"></div>`