atom.io 0.16.3 → 0.18.0

package/realtime-testing/dist/index.js

@@ -3,7 +3,7 @@ import { __spreadProps, __spreadValues } from '../../dist/chunk-PZLG2HP3.js';
 import * as http from 'http';
 import { render, prettyDOM } from '@testing-library/react';
 import * as AtomIO from 'atom.io';
-import * as Internal from 'atom.io/internal';
+import { IMPLICIT, findInStore, setIntoStore, getFromStore, clearStore } from 'atom.io/internal';
 import * as AR from 'atom.io/react';
 import * as RTR from 'atom.io/realtime-react';
 import * as RTS from 'atom.io/realtime-server';
@@ -12,8 +12,10 @@ import * as SocketIO from 'socket.io';
 import { io } from 'socket.io-client';
 import { jsx } from 'react/jsx-runtime';
 
+var testNumber = 0;
 var setupRealtimeTestServer = (options) => {
-  const silo = new AtomIO.Silo(`SERVER`, Internal.IMPLICIT.STORE);
+  ++testNumber;
+  const silo = new AtomIO.Silo(`SERVER-${testNumber}`, IMPLICIT.STORE);
   const httpServer = http.createServer((_, res) => res.end(`Hello World!`));
   const address = httpServer.listen().address();
   const port = typeof address === `string` ? 80 : address === null ? null : address.port;
@@ -22,26 +24,12 @@ var setupRealtimeTestServer = (options) => {
   const server = new SocketIO.Server(httpServer).use((socket, next) => {
     const { token, username } = socket.handshake.auth;
     if (token === `test` && socket.id) {
-      const socketRelatedKeysState = Internal.findInStore(
-        RTS.usersOfSockets.core.findRelatedKeysState,
-        socket.id,
-        silo.store
-      );
-      const clientRelatedKeysState = Internal.findInStore(
-        RTS.usersOfSockets.core.findRelatedKeysState,
-        username,
-        silo.store
-      );
-      AtomIO.setState(
-        socketRelatedKeysState,
-        (keys) => (keys.clear(), keys.add(username)),
-        silo.store
-      );
-      AtomIO.setState(
-        clientRelatedKeysState,
-        (keys) => (keys.clear(), keys.add(socket.id)),
-        silo.store
-      );
+      const socketState = findInStore(RTS.socketAtoms, socket.id, silo.store);
+      setIntoStore(socketState, socket, silo.store);
+      const usersOfSockets2 = RTS.usersOfSockets.in(silo.store);
+      usersOfSockets2.relations.set(socket.id, username);
+      setIntoStore(RTS.userIndex, (index) => index.add(username), silo.store);
+      setIntoStore(RTS.socketIndex, (index) => index.add(socket.id), silo.store);
       console.log(`${username} connected on ${socket.id}`);
       next();
     } else {
@@ -53,7 +41,15 @@ var setupRealtimeTestServer = (options) => {
   });
   const dispose = () => {
     server.close();
-    Internal.clearStore(silo.store);
+    const roomKeys = getFromStore(RTS.roomIndex, silo.store);
+    for (const roomKey of roomKeys) {
+      const roomState = findInStore(RTS.roomSelectors, roomKey, silo.store);
+      const room = getFromStore(roomState, silo.store);
+      if (room && !(room instanceof Promise)) {
+        room.kill();
+      }
+    }
+    silo.store.valueMap.clear();
   };
   return {
     name: `SERVER`,
@@ -67,9 +63,9 @@ var setupRealtimeTestClient = (options, name, port) => {
   } };
   const init = () => {
     const socket = io(`http://localhost:${port}/`, {
-      auth: { token: `test`, username: name }
+      auth: { token: `test`, username: `${name}-${testNumber}` }
     });
-    const silo = new AtomIO.Silo(name, Internal.IMPLICIT.STORE);
+    const silo = new AtomIO.Silo(name, IMPLICIT.STORE);
     for (const [key, value] of silo.store.valueMap.entries()) {
       if (Array.isArray(value)) {
         silo.store.valueMap.set(key, [...value]);
@@ -85,8 +81,9 @@ var setupRealtimeTestClient = (options, name, port) => {
     );
     const prettyPrint = () => console.log(prettyDOM(renderResult.container));
     const dispose = () => {
+      renderResult.unmount();
       socket.disconnect();
-      Internal.clearStore(silo.store);
+      clearStore(silo.store);
     };
     testClient.dispose = dispose;
     return {
@@ -101,7 +98,11 @@ var setupRealtimeTestClient = (options, name, port) => {
 };
 var singleClient = (options) => {
   const server = setupRealtimeTestServer(options);
-  const client = setupRealtimeTestClient(options, `CLIENT`, server.port);
+  const client = setupRealtimeTestClient(
+    options,
+    `CLIENT-${testNumber}`,
+    server.port
+  );
   return {
     client,
     server,

package/realtime-testing/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/setup-realtime-test.tsx"],"names":["clients"],"mappings":"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","sourcesContent":["import * as http from \"http\"\n\nimport { type RenderResult, prettyDOM, render } from \"@testing-library/react\"\nimport * as AtomIO from \"atom.io\"\nimport * as Internal from \"atom.io/internal\"\nimport * as AR from \"atom.io/react\"\nimport * as RTR from \"atom.io/realtime-react\"\nimport * as RTS from \"atom.io/realtime-server\"\nimport * as Happy from \"happy-dom\"\nimport * as React from \"react\"\nimport * as SocketIO from \"socket.io\"\nimport type { Socket as ClientSocket } from \"socket.io-client\"\nimport { io } from \"socket.io-client\"\n\nimport { recordToEntries } from \"~/packages/anvl/src/object\"\n\nexport type TestSetupOptions = {\n\tserver: (tools: { socket: SocketIO.Socket; silo: AtomIO.Silo }) => void\n}\nexport type TestSetupOptions__SingleClient = TestSetupOptions & {\n\tclient: React.FC\n}\nexport type TestSetupOptions__MultiClient<ClientNames extends string> =\n\tTestSetupOptions & {\n\t\tclients: {\n\t\t\t[K in ClientNames]: React.FC\n\t\t}\n\t}\n\nexport type RealtimeTestTools = {\n\tname: string\n\tsilo: AtomIO.Silo\n}\nexport type RealtimeTestClient = RealtimeTestTools & {\n\trenderResult: RenderResult\n\tprettyPrint: () => void\n\tsocket: ClientSocket\n}\nexport type RealtimeTestClientBuilder = {\n\tdispose: () => void\n\tinit: () => RealtimeTestClient\n}\n\nexport type RealtimeTestServer = RealtimeTestTools & {\n\tdispose: () => void\n\tport: number\n}\n\nexport type RealtimeTestAPI = {\n\tserver: RealtimeTestServer\n\tteardown: () => void\n}\nexport type RealtimeTestAPI__SingleClient = RealtimeTestAPI & {\n\tclient: RealtimeTestClientBuilder\n}\nexport type RealtimeTestAPI__MultiClient<ClientNames extends string> =\n\tRealtimeTestAPI & {\n\t\tclients: Record<ClientNames, RealtimeTestClientBuilder>\n\t}\n\nexport const setupRealtimeTestServer = (\n\toptions: TestSetupOptions,\n): RealtimeTestServer => {\n\tconst silo = new AtomIO.Silo(`SERVER`, Internal.IMPLICIT.STORE)\n\n\tconst httpServer = http.createServer((_, res) => res.end(`Hello World!`))\n\tconst address = httpServer.listen().address()\n\tconst port =\n\t\ttypeof address === `string` ? 80 : address === null ? null : address.port\n\tif (port === null) throw new Error(`Could not determine port for test server`)\n\tconst server = new SocketIO.Server(httpServer).use((socket, next) => {\n\t\tconst { token, username } = socket.handshake.auth\n\t\tif (token === `test` && socket.id) {\n\t\t\tconst socketRelatedKeysState = Internal.findInStore(\n\t\t\t\tRTS.usersOfSockets.core.findRelatedKeysState,\n\t\t\t\tsocket.id,\n\t\t\t\tsilo.store,\n\t\t\t)\n\t\t\tconst clientRelatedKeysState = Internal.findInStore(\n\t\t\t\tRTS.usersOfSockets.core.findRelatedKeysState,\n\t\t\t\tusername,\n\t\t\t\tsilo.store,\n\t\t\t)\n\t\t\tAtomIO.setState(\n\t\t\t\tsocketRelatedKeysState,\n\t\t\t\t(keys) => (keys.clear(), keys.add(username)),\n\t\t\t\tsilo.store,\n\t\t\t)\n\t\t\tAtomIO.setState(\n\t\t\t\tclientRelatedKeysState,\n\t\t\t\t(keys) => (keys.clear(), keys.add(socket.id)),\n\t\t\t\tsilo.store,\n\t\t\t)\n\t\t\tconsole.log(`${username} connected on ${socket.id}`)\n\t\t\tnext()\n\t\t} else {\n\t\t\tnext(new Error(`Authentication error`))\n\t\t}\n\t})\n\n\tserver.on(`connection`, (socket: SocketIO.Socket) => {\n\t\toptions.server({ socket, silo })\n\t})\n\n\tconst dispose = () => {\n\t\tserver.close()\n\t\tInternal.clearStore(silo.store)\n\t}\n\n\treturn {\n\t\tname: `SERVER`,\n\t\tsilo,\n\t\tdispose,\n\t\tport,\n\t}\n}\nexport const setupRealtimeTestClient = (\n\toptions: TestSetupOptions__SingleClient,\n\tname: string,\n\tport: number,\n): RealtimeTestClientBuilder => {\n\tconst testClient = { dispose: () => {} }\n\tconst init = () => {\n\t\tconst socket: ClientSocket = io(`http://localhost:${port}/`, {\n\t\t\tauth: { token: `test`, username: name },\n\t\t})\n\t\tconst silo = new AtomIO.Silo(name, Internal.IMPLICIT.STORE)\n\t\tfor (const [key, value] of silo.store.valueMap.entries()) {\n\t\t\tif (Array.isArray(value)) {\n\t\t\t\tsilo.store.valueMap.set(key, [...value])\n\t\t\t}\n\t\t}\n\n\t\tconst { document } = new Happy.Window()\n\t\tdocument.body.innerHTML = `<div id=\"app\"></div>`\n\t\tconst renderResult = render(\n\t\t\t<AR.StoreProvider store={silo.store}>\n\t\t\t\t<RTR.RealtimeProvider socket={socket}>\n\t\t\t\t\t<options.client />\n\t\t\t\t</RTR.RealtimeProvider>\n\t\t\t</AR.StoreProvider>,\n\t\t\t{\n\t\t\t\tcontainer: document.querySelector(`#app`) as unknown as HTMLElement,\n\t\t\t},\n\t\t)\n\n\t\tconst prettyPrint = () => console.log(prettyDOM(renderResult.container))\n\n\t\tconst dispose = () => {\n\t\t\tsocket.disconnect()\n\t\t\tInternal.clearStore(silo.store)\n\t\t}\n\t\ttestClient.dispose = dispose\n\n\t\treturn {\n\t\t\tname,\n\t\t\tsilo,\n\t\t\tsocket,\n\t\t\trenderResult,\n\t\t\tprettyPrint,\n\t\t}\n\t}\n\treturn Object.assign(testClient, { init })\n}\n\nexport const singleClient = (\n\toptions: TestSetupOptions__SingleClient,\n): RealtimeTestAPI__SingleClient => {\n\tconst server = setupRealtimeTestServer(options)\n\tconst client = setupRealtimeTestClient(options, `CLIENT`, server.port)\n\n\treturn {\n\t\tclient,\n\t\tserver,\n\t\tteardown: () => {\n\t\t\tclient.dispose()\n\t\t\tserver.dispose()\n\t\t},\n\t}\n}\n\nexport const multiClient = <ClientNames extends string>(\n\toptions: TestSetupOptions__MultiClient<ClientNames>,\n): RealtimeTestAPI__MultiClient<ClientNames> => {\n\tconst server = setupRealtimeTestServer(options)\n\tconst clients = recordToEntries(options.clients).reduce(\n\t\t(clients, [name, client]) => {\n\t\t\tclients[name] = setupRealtimeTestClient(\n\t\t\t\t{ ...options, client },\n\t\t\t\tname,\n\t\t\t\tserver.port,\n\t\t\t)\n\t\t\treturn clients\n\t\t},\n\t\t{} as Record<ClientNames, RealtimeTestClientBuilder>,\n\t)\n\n\treturn {\n\t\tclients,\n\t\tserver,\n\t\tteardown: () => {\n\t\t\tfor (const [, client] of recordToEntries(clients)) {\n\t\t\t\tclient.dispose()\n\t\t\t}\n\t\t\tserver.dispose()\n\t\t},\n\t}\n}\n"]}
+{"version":3,"sources":["../src/setup-realtime-test.tsx"],"names":["usersOfSockets","clients"],"mappings":"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","sourcesContent":["import * as http from \"http\"\n\nimport { prettyDOM, render } from \"@testing-library/react\"\nimport type { RenderResult } from \"@testing-library/react\"\nimport * as AtomIO from \"atom.io\"\nimport {\n\tIMPLICIT,\n\tclearStore,\n\tfindInStore,\n\tgetFromStore,\n\tsetIntoStore,\n} from \"atom.io/internal\"\nimport * as AR from \"atom.io/react\"\nimport * as RTR from \"atom.io/realtime-react\"\nimport * as RTS from \"atom.io/realtime-server\"\nimport * as Happy from \"happy-dom\"\nimport * as React from \"react\"\nimport * as SocketIO from \"socket.io\"\nimport type { Socket as ClientSocket } from \"socket.io-client\"\nimport { io } from \"socket.io-client\"\n\nimport { recordToEntries } from \"~/packages/anvl/src/object\"\n\nlet testNumber = 0\n\nexport type TestSetupOptions = {\n\tserver: (tools: { socket: SocketIO.Socket; silo: AtomIO.Silo }) => void\n}\nexport type TestSetupOptions__SingleClient = TestSetupOptions & {\n\tclient: React.FC\n}\nexport type TestSetupOptions__MultiClient<ClientNames extends string> =\n\tTestSetupOptions & {\n\t\tclients: {\n\t\t\t[K in ClientNames]: React.FC\n\t\t}\n\t}\n\nexport type RealtimeTestTools = {\n\tname: string\n\tsilo: AtomIO.Silo\n}\nexport type RealtimeTestClient = RealtimeTestTools & {\n\trenderResult: RenderResult\n\tprettyPrint: () => void\n\tsocket: ClientSocket\n}\nexport type RealtimeTestClientBuilder = {\n\tdispose: () => void\n\tinit: () => RealtimeTestClient\n}\n\nexport type RealtimeTestServer = RealtimeTestTools & {\n\tdispose: () => void\n\tport: number\n}\n\nexport type RealtimeTestAPI = {\n\tserver: RealtimeTestServer\n\tteardown: () => void\n}\nexport type RealtimeTestAPI__SingleClient = RealtimeTestAPI & {\n\tclient: RealtimeTestClientBuilder\n}\nexport type RealtimeTestAPI__MultiClient<ClientNames extends string> =\n\tRealtimeTestAPI & {\n\t\tclients: Record<ClientNames, RealtimeTestClientBuilder>\n\t}\n\nexport const setupRealtimeTestServer = (\n\toptions: TestSetupOptions,\n): RealtimeTestServer => {\n\t++testNumber\n\tconst silo = new AtomIO.Silo(`SERVER-${testNumber}`, IMPLICIT.STORE)\n\n\tconst httpServer = http.createServer((_, res) => res.end(`Hello World!`))\n\tconst address = httpServer.listen().address()\n\tconst port =\n\t\ttypeof address === `string` ? 80 : address === null ? null : address.port\n\tif (port === null) throw new Error(`Could not determine port for test server`)\n\n\tconst server = new SocketIO.Server(httpServer).use((socket, next) => {\n\t\tconst { token, username } = socket.handshake.auth\n\t\tif (token === `test` && socket.id) {\n\t\t\tconst socketState = findInStore(RTS.socketAtoms, socket.id, silo.store)\n\t\t\tsetIntoStore(socketState, socket, silo.store)\n\t\t\tconst usersOfSockets = RTS.usersOfSockets.in(silo.store)\n\t\t\tusersOfSockets.relations.set(socket.id, username)\n\t\t\tsetIntoStore(RTS.userIndex, (index) => index.add(username), silo.store)\n\t\t\tsetIntoStore(RTS.socketIndex, (index) => index.add(socket.id), silo.store)\n\t\t\tconsole.log(`${username} connected on ${socket.id}`)\n\t\t\tnext()\n\t\t} else {\n\t\t\tnext(new Error(`Authentication error`))\n\t\t}\n\t})\n\n\tserver.on(`connection`, (socket: SocketIO.Socket) => {\n\t\toptions.server({ socket, silo })\n\t})\n\n\tconst dispose = () => {\n\t\tserver.close()\n\t\tconst roomKeys = getFromStore(RTS.roomIndex, silo.store)\n\t\tfor (const roomKey of roomKeys) {\n\t\t\tconst roomState = findInStore(RTS.roomSelectors, roomKey, silo.store)\n\t\t\tconst room = getFromStore(roomState, silo.store)\n\t\t\tif (room && !(room instanceof Promise)) {\n\t\t\t\troom.kill()\n\t\t\t}\n\t\t}\n\t\tsilo.store.valueMap.clear()\n\t}\n\n\treturn {\n\t\tname: `SERVER`,\n\t\tsilo,\n\t\tdispose,\n\t\tport,\n\t}\n}\nexport const setupRealtimeTestClient = (\n\toptions: TestSetupOptions__SingleClient,\n\tname: string,\n\tport: number,\n): RealtimeTestClientBuilder => {\n\tconst testClient = { dispose: () => {} }\n\tconst init = () => {\n\t\tconst socket: ClientSocket = io(`http://localhost:${port}/`, {\n\t\t\tauth: { token: `test`, username: `${name}-${testNumber}` },\n\t\t})\n\t\tconst silo = new AtomIO.Silo(name, IMPLICIT.STORE)\n\t\tfor (const [key, value] of silo.store.valueMap.entries()) {\n\t\t\tif (Array.isArray(value)) {\n\t\t\t\tsilo.store.valueMap.set(key, [...value])\n\t\t\t}\n\t\t}\n\n\t\tconst { document } = new Happy.Window()\n\t\tdocument.body.innerHTML = `<div id=\"app\"></div>`\n\t\tconst renderResult = render(\n\t\t\t<AR.StoreProvider store={silo.store}>\n\t\t\t\t<RTR.RealtimeProvider socket={socket}>\n\t\t\t\t\t<options.client />\n\t\t\t\t</RTR.RealtimeProvider>\n\t\t\t</AR.StoreProvider>,\n\t\t\t{\n\t\t\t\tcontainer: document.querySelector(`#app`) as unknown as HTMLElement,\n\t\t\t},\n\t\t)\n\n\t\tconst prettyPrint = () => console.log(prettyDOM(renderResult.container))\n\n\t\tconst dispose = () => {\n\t\t\trenderResult.unmount()\n\t\t\tsocket.disconnect()\n\t\t\tclearStore(silo.store)\n\t\t}\n\t\ttestClient.dispose = dispose\n\n\t\treturn {\n\t\t\tname,\n\t\t\tsilo,\n\t\t\tsocket,\n\t\t\trenderResult,\n\t\t\tprettyPrint,\n\t\t}\n\t}\n\treturn Object.assign(testClient, { init })\n}\n\nexport const singleClient = (\n\toptions: TestSetupOptions__SingleClient,\n): RealtimeTestAPI__SingleClient => {\n\tconst server = setupRealtimeTestServer(options)\n\tconst client = setupRealtimeTestClient(\n\t\toptions,\n\t\t`CLIENT-${testNumber}`,\n\t\tserver.port,\n\t)\n\n\treturn {\n\t\tclient,\n\t\tserver,\n\t\tteardown: () => {\n\t\t\tclient.dispose()\n\t\t\tserver.dispose()\n\t\t},\n\t}\n}\n\nexport const multiClient = <ClientNames extends string>(\n\toptions: TestSetupOptions__MultiClient<ClientNames>,\n): RealtimeTestAPI__MultiClient<ClientNames> => {\n\tconst server = setupRealtimeTestServer(options)\n\tconst clients = recordToEntries(options.clients).reduce(\n\t\t(clients, [name, client]) => {\n\t\t\tclients[name] = setupRealtimeTestClient(\n\t\t\t\t{ ...options, client },\n\t\t\t\tname,\n\t\t\t\tserver.port,\n\t\t\t)\n\t\t\treturn clients\n\t\t},\n\t\t{} as Record<ClientNames, RealtimeTestClientBuilder>,\n\t)\n\n\treturn {\n\t\tclients,\n\t\tserver,\n\t\tteardown: () => {\n\t\t\tfor (const [, client] of recordToEntries(clients)) {\n\t\t\t\tclient.dispose()\n\t\t\t}\n\t\t\tserver.dispose()\n\t\t},\n\t}\n}\n"]}

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

@@ -1,8 +1,15 @@
 import * as http from "http"
 
-import { type RenderResult, prettyDOM, render } from "@testing-library/react"
+import { prettyDOM, render } from "@testing-library/react"
+import type { RenderResult } from "@testing-library/react"
 import * as AtomIO from "atom.io"
-import * as Internal from "atom.io/internal"
+import {
+	IMPLICIT,
+	clearStore,
+	findInStore,
+	getFromStore,
+	setIntoStore,
+} from "atom.io/internal"
 import * as AR from "atom.io/react"
 import * as RTR from "atom.io/realtime-react"
 import * as RTS from "atom.io/realtime-server"
@@ -14,6 +21,8 @@ import { io } from "socket.io-client"
 
 import { recordToEntries } from "~/packages/anvl/src/object"
 
+let testNumber = 0
+
 export type TestSetupOptions = {
 	server: (tools: { socket: SocketIO.Socket; silo: AtomIO.Silo }) => void
 }
@@ -61,36 +70,24 @@ export type RealtimeTestAPI__MultiClient<ClientNames extends string> =
 export const setupRealtimeTestServer = (
 	options: TestSetupOptions,
 ): RealtimeTestServer => {
-	const silo = new AtomIO.Silo(`SERVER`, Internal.IMPLICIT.STORE)
+	++testNumber
+	const silo = new AtomIO.Silo(`SERVER-${testNumber}`, IMPLICIT.STORE)
 
 	const httpServer = http.createServer((_, res) => res.end(`Hello World!`))
 	const address = httpServer.listen().address()
 	const port =
 		typeof address === `string` ? 80 : address === null ? null : address.port
 	if (port === null) throw new Error(`Could not determine port for test server`)
+
 	const server = new SocketIO.Server(httpServer).use((socket, next) => {
 		const { token, username } = socket.handshake.auth
 		if (token === `test` && socket.id) {
-			const socketRelatedKeysState = Internal.findInStore(
-				RTS.usersOfSockets.core.findRelatedKeysState,
-				socket.id,
-				silo.store,
-			)
-			const clientRelatedKeysState = Internal.findInStore(
-				RTS.usersOfSockets.core.findRelatedKeysState,
-				username,
-				silo.store,
-			)
-			AtomIO.setState(
-				socketRelatedKeysState,
-				(keys) => (keys.clear(), keys.add(username)),
-				silo.store,
-			)
-			AtomIO.setState(
-				clientRelatedKeysState,
-				(keys) => (keys.clear(), keys.add(socket.id)),
-				silo.store,
-			)
+			const socketState = findInStore(RTS.socketAtoms, socket.id, silo.store)
+			setIntoStore(socketState, socket, silo.store)
+			const usersOfSockets = RTS.usersOfSockets.in(silo.store)
+			usersOfSockets.relations.set(socket.id, username)
+			setIntoStore(RTS.userIndex, (index) => index.add(username), silo.store)
+			setIntoStore(RTS.socketIndex, (index) => index.add(socket.id), silo.store)
 			console.log(`${username} connected on ${socket.id}`)
 			next()
 		} else {
@@ -104,7 +101,15 @@ export const setupRealtimeTestServer = (
 
 	const dispose = () => {
 		server.close()
-		Internal.clearStore(silo.store)
+		const roomKeys = getFromStore(RTS.roomIndex, silo.store)
+		for (const roomKey of roomKeys) {
+			const roomState = findInStore(RTS.roomSelectors, roomKey, silo.store)
+			const room = getFromStore(roomState, silo.store)
+			if (room && !(room instanceof Promise)) {
+				room.kill()
+			}
+		}
+		silo.store.valueMap.clear()
 	}
 
 	return {
@@ -122,9 +127,9 @@ export const setupRealtimeTestClient = (
 	const testClient = { dispose: () => {} }
 	const init = () => {
 		const socket: ClientSocket = io(`http://localhost:${port}/`, {
-			auth: { token: `test`, username: name },
+			auth: { token: `test`, username: `${name}-${testNumber}` },
 		})
-		const silo = new AtomIO.Silo(name, Internal.IMPLICIT.STORE)
+		const silo = new AtomIO.Silo(name, IMPLICIT.STORE)
 		for (const [key, value] of silo.store.valueMap.entries()) {
 			if (Array.isArray(value)) {
 				silo.store.valueMap.set(key, [...value])
@@ -147,8 +152,9 @@ export const setupRealtimeTestClient = (
 		const prettyPrint = () => console.log(prettyDOM(renderResult.container))
 
 		const dispose = () => {
+			renderResult.unmount()
 			socket.disconnect()
-			Internal.clearStore(silo.store)
+			clearStore(silo.store)
 		}
 		testClient.dispose = dispose
 
@@ -167,7 +173,11 @@ export const singleClient = (
 	options: TestSetupOptions__SingleClient,
 ): RealtimeTestAPI__SingleClient => {
 	const server = setupRealtimeTestServer(options)
-	const client = setupRealtimeTestClient(options, `CLIENT`, server.port)
+	const client = setupRealtimeTestClient(
+		options,
+		`CLIENT-${testNumber}`,
+		server.port,
+	)
 
 	return {
 		client,

package/src/atom.ts

@@ -45,23 +45,30 @@ export type RegularAtomFamilyOptions<T, K extends Json.Serializable> = {
 	effects?: (key: K) => AtomEffect<T>[]
 }
 
-export type RegularAtomFamily<
-	T,
-	K extends Json.Serializable = Json.Serializable,
-> = ((key: K) => RegularAtomToken<T>) & {
-	key: string
-	type: `atom_family`
-	subject: Subject<RegularAtomToken<T>>
-	install: (store: Store) => void
-	__T?: T
-	__K?: K
-}
 export type RegularAtomFamilyToken<T, K extends Json.Serializable> = {
 	key: string
 	type: `atom_family`
 	__T?: T
 	__K?: K
 }
+// biome-ignore format: intersection
+export type RegularAtomFamilyTokenWithCall<
+	T,
+	K extends Json.Serializable,
+> = 
+	& RegularAtomFamilyToken<T, K>
+	& {
+		/** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
+		(key: K): RegularAtomToken<T>
+	}
+// biome-ignore format: intersection
+export type RegularAtomFamily<T, K extends Json.Serializable> = 
+	& RegularAtomFamilyToken<T, K>
+	& {
+		(key: K): RegularAtomToken<T>
+		subject: Subject<RegularAtomToken<T>>
+		install: (store: Store) => void
+	}
 
 // biome-ignore format: intersection
 export type MutableAtomFamilyOptions<
@@ -77,23 +84,6 @@ export type MutableAtomFamilyOptions<
 		mutable: true,
 	}
 
-// biome-ignore format: intersection
-export type MutableAtomFamily<
-	T extends Transceiver<any>,
-	J extends Json.Serializable,
-	K extends Json.Serializable,
-> = 
-	& JsonInterface<T, J>
-	& ((key: K) => MutableAtomToken<T, J>) 
-	& {
-			key: string
-			type: `mutable_atom_family`
-			subject: Subject<MutableAtomToken<T, J>>
-			install: (store: Store) => void
-			__T?: T
-			__J?: J
-			__K?: K
-		}
 export type MutableAtomFamilyToken<
 	T extends Transceiver<any>,
 	J extends Json.Serializable,
@@ -105,6 +95,30 @@ export type MutableAtomFamilyToken<
 	__J?: J
 	__K?: K
 }
+// biome-ignore format: intersection
+export type MutableAtomFamilyTokenWithCall<
+	T extends Transceiver<any>,
+	J extends Json.Serializable,
+	K extends Json.Serializable,
+> = 
+	& MutableAtomFamilyToken<T, J, K>
+	& {
+		/** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
+		(key: K): MutableAtomToken<T, J>
+	}
+// biome-ignore format: intersection
+export type MutableAtomFamily<
+	T extends Transceiver<any>,
+	J extends Json.Serializable,
+	K extends Json.Serializable,
+> = 
+	& JsonInterface<T, J>
+	& MutableAtomFamilyToken<T, J, K>
+	& {
+			(key: K): MutableAtomToken<T, J>
+			subject: Subject<MutableAtomToken<T, J>>
+			install: (store: Store) => void
+		}
 
 export type AtomFamily<T, K extends Json.Serializable = Json.Serializable> =
 	| MutableAtomFamily<T extends Transceiver<any> ? T : never, any, K>
@@ -117,14 +131,18 @@ export function atomFamily<
 	T extends Transceiver<any>,
 	J extends Json.Serializable,
 	K extends Json.Serializable,
->(options: MutableAtomFamilyOptions<T, J, K>): MutableAtomFamily<T, J, K>
+>(
+	options: MutableAtomFamilyOptions<T, J, K>,
+): MutableAtomFamilyTokenWithCall<T, J, K>
 export function atomFamily<T, K extends Json.Serializable>(
 	options: RegularAtomFamilyOptions<T, K>,
-): RegularAtomFamily<T, K>
+): RegularAtomFamilyTokenWithCall<T, K>
 export function atomFamily<T, K extends Json.Serializable>(
 	options:
 		| MutableAtomFamilyOptions<any, any, any>
 		| RegularAtomFamilyOptions<T, K>,
-): MutableAtomFamily<any, any, any> | RegularAtomFamily<T, K> {
+):
+	| MutableAtomFamilyTokenWithCall<any, any, any>
+	| RegularAtomFamilyTokenWithCall<T, K> {
 	return createAtomFamily(options, IMPLICIT.STORE)
 }

package/src/get-state.ts

@@ -2,15 +2,6 @@ import * as Internal from "atom.io/internal"
 
 import type { ReadableToken } from "."
 
-export function getState<T>(
-	token: ReadableToken<T>,
-	store: Internal.Store = Internal.IMPLICIT.STORE,
-): T {
-	const state =
-		Internal.withdraw(token, store) ??
-		Internal.withdrawNewFamilyMember(token, store)
-	if (state === undefined) {
-		throw new Internal.NotFoundError(token, store)
-	}
-	return Internal.readOrComputeValue(state, store)
+export function getState<T>(token: ReadableToken<T>): T {
+	return Internal.getFromStore(token, Internal.IMPLICIT.STORE)
 }

package/src/logger.ts

@@ -6,20 +6,23 @@ const LoggerIconDictionary = {
 	"⏮️": `Transaction undo`,
 	"⏳": `Timeline event partially captured`,
 	"⏹️": `Time-travel complete`,
-	"💁": `Notice`,
-	"🔄": `Realtime transaction synchronized`,
 	"✅": `Realtime transaction success`,
 	"✨": `Computation complete`,
 	"❌": `Conflict prevents attempted action`,
 	"⭕": `Operation start`,
 	"🐞": `Possible bug in AtomIO`,
 	"👀": `Subscription added`,
+	"👋": `Greeting`,
+	"👍": `Realtime acknowledgment`,
 	"👪": `Family member added`,
+	"💁": `Notice`,
+	"💥": `Caught`,
 	"📁": `Stow update`,
 	"📃": `Copy mutable`,
 	"📖": `Read state`,
 	"📝": `Write state`,
 	"📢": `Notify subscribers`,
+	"🔄": `Realtime transaction synchronized`,
 	"🔌": `Register dependency`,
 	"🔍": `Discover root`,
 	"🔥": `Delete state`,
@@ -27,8 +30,8 @@ const LoggerIconDictionary = {
 	"🔨": `Create immutable atom`,
 	"🔴": `Operation complete`,
 	"🗑": `Evict cached value`,
-	"💥": `Caught`,
 	"🙈": `Subscription canceled`,
+	"🚀": `Performance measure`,
 	"🛄": `Apply transaction`,
 	"🛠️": `Install atom into store`,
 	"🛫": `Begin transaction`,
@@ -36,14 +39,16 @@ const LoggerIconDictionary = {
 	"🧮": `Computing selector`,
 	"🧹": `Prepare to evict`,
 	"🪂": `Abort transaction`,
-	"🚀": `Performance measure`,
+	"🤞": `Realtime optimistic update enqueued`,
+	"👈": `Realtime confirmed update enqueued`,
+	"⚖️": `Realtime update beginning reconciliation`,
 } as const
 export type LoggerIcon = keyof typeof LoggerIconDictionary
 export type TokenDenomination =
 	| `atom`
+	| `continuity`
 	| `mutable_atom`
 	| `readonly_selector`
-	| `realtime_sync_group`
 	| `selector`
 	| `state`
 	| `timeline`

package/src/selector.ts

@@ -41,41 +41,58 @@ export type ReadonlySelectorFamilyOptions<T, K extends Json.Serializable> = {
 	get: (key: K) => Read<() => T>
 }
 
-export type WritableSelectorFamily<
-	T,
-	K extends Json.Serializable = Json.Serializable,
-> = ((key: K) => WritableSelectorToken<T>) & {
-	key: string
-	type: `selector_family`
-	subject: Subject<WritableSelectorToken<T>>
-	install: (store: Store) => void
-	__T?: T
-	__K?: K
-}
 export type WritableSelectorFamilyToken<T, K extends Json.Serializable> = {
 	key: string
 	type: `selector_family`
 	__T?: T
 	__K?: K
 }
-
-export type ReadonlySelectorFamily<
+// biome-ignore format: intersection
+export type WritableSelectorFamilyTokenWithCall<
 	T,
-	K extends Json.Serializable = Json.Serializable,
-> = ((key: K) => ReadonlySelectorToken<T>) & {
-	key: string
-	type: `readonly_selector_family`
-	subject: Subject<ReadonlySelectorToken<T>>
-	install: (store: Store) => void
-	__T?: T
-	__K?: K
-}
+	K extends Json.Serializable,
+> = 
+	& WritableSelectorFamilyToken<T, K>
+	& {
+		/** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
+		(key: K): WritableSelectorToken<T>
+	}
+// biome-ignore format: intersection
+export type WritableSelectorFamily<T, K extends Json.Serializable> = 
+	& WritableSelectorFamilyToken<T, K> 
+	& {
+		(key: K): WritableSelectorToken<T>
+		subject: Subject<WritableSelectorToken<T>>
+		install: (store: Store) => void
+	}
+
 export type ReadonlySelectorFamilyToken<T, K extends Json.Serializable> = {
 	key: string
 	type: `readonly_selector_family`
 	__T?: T
 	__K?: K
 }
+// biome-ignore format: intersection
+export type ReadonlySelectorFamilyTokenWithCall<
+	T,
+	K extends Json.Serializable,
+> = 
+	& ReadonlySelectorFamilyToken<T, K>
+	& {
+		/** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
+		(key: K): ReadonlySelectorToken<T>
+	}
+// biome-ignore format: intersection
+export type ReadonlySelectorFamily<T, K extends Json.Serializable> = 
+	& ((key: K) => ReadonlySelectorToken<T>)
+	& {
+		key: string
+		type: `readonly_selector_family`
+		subject: Subject<ReadonlySelectorToken<T>>
+		install: (store: Store) => void
+		__T?: T
+		__K?: K
+	}
 
 export type SelectorFamily<T, K extends Json.Serializable> =
 	| ReadonlySelectorFamily<T, K>
@@ -86,14 +103,16 @@ export type SelectorFamilyToken<T, K extends Json.Serializable> =
 
 export function selectorFamily<T, K extends Json.Serializable>(
 	options: WritableSelectorFamilyOptions<T, K>,
-): WritableSelectorFamily<T, K>
+): WritableSelectorFamilyTokenWithCall<T, K>
 export function selectorFamily<T, K extends Json.Serializable>(
 	options: ReadonlySelectorFamilyOptions<T, K>,
-): ReadonlySelectorFamily<T, K>
+): ReadonlySelectorFamilyTokenWithCall<T, K>
 export function selectorFamily<T, K extends Json.Serializable>(
 	options:
 		| ReadonlySelectorFamilyOptions<T, K>
 		| WritableSelectorFamilyOptions<T, K>,
-): ReadonlySelectorFamily<T, K> | WritableSelectorFamily<T, K> {
+):
+	| ReadonlySelectorFamilyTokenWithCall<T, K>
+	| WritableSelectorFamilyTokenWithCall<T, K> {
 	return createSelectorFamily(options, IMPLICIT.STORE)
 }

package/src/set-state.ts

@@ -5,18 +5,6 @@ import type { WritableToken } from "."
 export function setState<T, New extends T>(
 	token: WritableToken<T>,
 	value: New | ((oldValue: T) => New),
-	store: Internal.Store = Internal.IMPLICIT.STORE,
 ): void {
-	const rejection = Internal.openOperation(token, store)
-	if (rejection) {
-		return
-	}
-	const state =
-		Internal.withdraw(token, store) ??
-		Internal.withdrawNewFamilyMember(token, store)
-	if (state === undefined) {
-		throw new Internal.NotFoundError(token, store)
-	}
-	Internal.setAtomOrSelector(state, value, store)
-	Internal.closeOperation(store)
+	Internal.setIntoStore(token, value, Internal.IMPLICIT.STORE)
 }

package/src/silo.ts

@@ -7,6 +7,8 @@ import {
 	createStandaloneSelector,
 	createTimeline,
 	createTransaction,
+	getFromStore,
+	setIntoStore,
 	timeTravel,
 } from "atom.io/internal"
 import type { Json } from "atom.io/json"
@@ -21,11 +23,13 @@ import type {
 	RegularAtomFamilyOptions,
 	RegularAtomOptions,
 	RegularAtomToken,
+	getState,
 	redo,
+	setState,
 	timeline,
 	undo,
 } from "."
-import { getState, setState, subscribe } from "."
+import { subscribe } from "."
 import type { atom, atomFamily } from "./atom"
 import type { selector, selectorFamily } from "./selector"
 import type { transaction } from "./transaction"
@@ -76,8 +80,8 @@ export class Silo {
 		this.selectorFamily = (options) => createSelectorFamily(options, s) as any
 		this.transaction = (options) => createTransaction(options, s)
 		this.timeline = (options) => createTimeline(options, s)
-		this.getState = (token) => getState(token, s)
-		this.setState = (token, newValue) => setState(token, newValue, s)
+		this.getState = (token) => getFromStore(token, s)
+		this.setState = (token, newValue) => setIntoStore(token, newValue, s)
 		this.subscribe = (token, handler, key) => subscribe(token, handler, key, s)
 		this.undo = (token) => timeTravel(`undo`, token, s)
 		this.redo = (token) => timeTravel(`redo`, token, s)

package/src/subscribe.ts

@@ -1,6 +1,7 @@
 import type { Store } from "atom.io/internal"
 import {
 	IMPLICIT,
+	arbitrary,
 	subscribeToState,
 	subscribeToTimeline,
 	subscribeToTransaction,
@@ -49,7 +50,7 @@ export function subscribe<M extends TimelineManageable>(
 export function subscribe(
 	token: ReadableToken<any> | TimelineToken<any> | TransactionToken<any>,
 	handleUpdate: (update: any) => void,
-	key: string = Math.random().toString(36).slice(2),
+	key: string = arbitrary(),
 	store = IMPLICIT.STORE,
 ): () => void {
 	switch (token.type) {

package/src/timeline.ts

@@ -6,14 +6,14 @@ import type {
 } from "atom.io/internal"
 import { IMPLICIT, createTimeline, timeTravel } from "atom.io/internal"
 
-import type { AtomFamily, AtomToken } from "."
+import type { AtomFamilyToken, AtomToken } from "."
 
-export type TimelineManageable = AtomFamily<any, any> | AtomToken<any>
+export type TimelineManageable = AtomFamilyToken<any, any> | AtomToken<any>
 
-export type TimelineToken<_> = {
+export type TimelineToken<M> = {
 	key: string
 	type: `timeline`
-	__brand?: _
+	__M?: M
 }
 
 export type TimelineOptions<ManagedAtom extends TimelineManageable> = {