atom.io 0.27.4 → 0.28.0

package/realtime-server/dist/index.js

@@ -484,7 +484,7 @@ function realtimeContinuitySynchronizer({
       socket.id,
       store
     ).userKeyOfSocket;
-    const userKey = getFromStore(userKeyState, store);
+    const userKey = getFromStore(store, userKeyState);
     if (!userKey) {
       store.logger.error(
         `\u274C`,
@@ -510,36 +510,42 @@ function realtimeContinuitySynchronizer({
           `seeing ${userKey} on new socket ${newSocketKey}`
         );
         if (newSocketKey === null) {
-          store.logger.error(
+          store.logger.warn(
             `\u274C`,
             `continuity`,
             continuityKey,
-            `Tried to create a synchronizer for a user (${userKey}) that is not connected to a socket.`
+            `User (${userKey}) is not connected to a socket, waiting for them to reappear.`
           );
           return;
         }
-        const newSocketState = findInStore(socketAtoms, newSocketKey, store);
-        const newSocket = getFromStore(newSocketState, store);
+        const newSocketState = findInStore(store, socketAtoms, newSocketKey);
+        const newSocket = getFromStore(store, newSocketState);
         socket = newSocket;
+        for (const unacknowledgedUpdate of userUnacknowledgedUpdates) {
+          socket?.emit(
+            `tx-new:${continuityKey}`,
+            unacknowledgedUpdate
+          );
+        }
       },
       `sync-continuity:${continuityKey}:${userKey}`,
       store
     );
     const userUnacknowledgedQueue = findInStore(
+      store,
       userUnacknowledgedQueues,
-      userKey,
-      store
+      userKey
     );
-    getFromStore(
-      userUnacknowledgedQueue,
-      store
+    const userUnacknowledgedUpdates = getFromStore(
+      store,
+      userUnacknowledgedQueue
     );
     const unsubscribeFunctions = [];
     const revealPerspectives = () => {
       const unsubFns = [];
       for (const perspective of continuity.perspectives) {
         const { viewAtoms } = perspective;
-        const userViewState = findInStore(viewAtoms, userKey, store);
+        const userViewState = findInStore(store, viewAtoms, userKey);
         const unsubscribe = subscribeToState(
           userViewState,
           ({ oldValue, newValue }) => {
@@ -549,8 +555,8 @@ function realtimeContinuitySynchronizer({
               (token) => !newKeys.includes(token.key)
             );
             const revealed = newValue.filter((token) => !oldKeys.includes(token.key)).flatMap((token) => {
-              const resourceToken = token.type === `mutable_atom` ? getJsonToken(token, store) : token;
-              const resource = getFromStore(resourceToken, store);
+              const resourceToken = token.type === `mutable_atom` ? getJsonToken(store, token) : token;
+              const resource = getFromStore(store, resourceToken);
               return [resourceToken, resource];
             });
             store.logger.info(
@@ -580,21 +586,22 @@ function realtimeContinuitySynchronizer({
     const sendInitialPayload = () => {
       const initialPayload = [];
       for (const atom2 of continuity.globals) {
-        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(atom2, store) : atom2;
-        initialPayload.push(resourceToken, getFromStore(atom2, store));
+        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(store, atom2) : atom2;
+        const resource = getFromStore(store, resourceToken);
+        initialPayload.push(resourceToken, resource);
       }
       for (const perspective of continuity.perspectives) {
         const { viewAtoms, resourceAtoms } = perspective;
-        const userViewState = findInStore(viewAtoms, userKey, store);
-        const userView = getFromStore(userViewState, store);
+        const userViewState = findInStore(store, viewAtoms, userKey);
+        const userView = getFromStore(store, userViewState);
         store.logger.info(`\u{1F441}`, `atom`, resourceAtoms.key, `${userKey} can see`, {
           viewAtoms,
           resourceAtoms,
           userView
         });
         for (const visibleToken of userView) {
-          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(visibleToken, store) : visibleToken;
-          const resource = getFromStore(resourceToken, store);
+          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(store, visibleToken) : visibleToken;
+          const resource = getFromStore(store, resourceToken);
           initialPayload.push(resourceToken, resource);
         }
       }
@@ -605,17 +612,22 @@ function realtimeContinuitySynchronizer({
           transaction2,
           (update) => {
             try {
-              const visibleKeys = continuity.globals.map((atom2) => atom2.key).concat(
+              const visibleKeys = continuity.globals.map((atom2) => {
+                if (atom2.type === `atom`) {
+                  return atom2.key;
+                }
+                return getUpdateToken(atom2).key;
+              }).concat(
                 continuity.perspectives.flatMap((perspective) => {
                   const { viewAtoms } = perspective;
                   const userPerspectiveTokenState = findInStore(
+                    store,
                     viewAtoms,
-                    userKey,
-                    store
+                    userKey
                   );
                   const visibleTokens = getFromStore(
-                    userPerspectiveTokenState,
-                    store
+                    store,
+                    userPerspectiveTokenState
                   );
                   return visibleTokens.map((token) => {
                     const key = token.type === `mutable_atom` ? `*` + token.key : token.key;
@@ -631,6 +643,13 @@ function realtimeContinuitySynchronizer({
                 ...update,
                 updates: redactedUpdates
               };
+              setIntoStore(store, userUnacknowledgedQueue, (updates) => {
+                if (redactedUpdate) {
+                  updates.push(redactedUpdate);
+                  updates.sort((a, b) => a.epoch - b.epoch);
+                }
+                return updates;
+              });
               socket?.emit(
                 `tx-new:${continuityKey}`,
                 redactedUpdate
@@ -710,8 +729,25 @@ function realtimeContinuitySynchronizer({
     };
     socket.off(`tx-run:${continuityKey}`, fillTransactionRequest);
     socket.on(`tx-run:${continuityKey}`, fillTransactionRequest);
+    const trackClientAcknowledgement = (epoch) => {
+      store.logger.info(
+        `\u{1F44D}`,
+        `continuity`,
+        continuityKey,
+        `${userKey} acknowledged epoch ${epoch}`
+      );
+      const isUnacknowledged = userUnacknowledgedUpdates[0]?.epoch === epoch;
+      if (isUnacknowledged) {
+        setIntoStore(store, userUnacknowledgedQueue, (updates) => {
+          updates.shift();
+          return updates;
+        });
+      }
+    };
+    socket?.on(`ack:${continuityKey}`, trackClientAcknowledgement);
     return () => {
       for (const unsubscribe of unsubscribeFunctions) unsubscribe();
+      socket?.off(`ack:${continuityKey}`, trackClientAcknowledgement);
       unsubscribeFromPerspectives();
       socket?.off(`get:${continuityKey}`, sendInitialPayload);
       socket?.off(`tx-run:${continuityKey}`, fillTransactionRequest);
@@ -733,11 +769,11 @@ function realtimeAtomFamilyProvider({
       }
     };
     const fillSubRequest = (subKey) => {
-      const exposedSubKeys = getFromStore(index, store);
+      const exposedSubKeys = getFromStore(store, index);
       for (const exposedSubKey of exposedSubKeys) {
         if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-          const token = findInStore(family, subKey, store);
-          socket.emit(`serve:${token.key}`, getFromStore(token, store));
+          const token = findInStore(store, family, subKey);
+          socket.emit(`serve:${token.key}`, getFromStore(store, token));
           const unsubscribe = subscribeToState(
             token,
             ({ newValue }) => {
@@ -779,14 +815,14 @@ function realtimeMutableFamilyProvider({
       }
     };
     const fillSubRequest = (subKey) => {
-      const exposedSubKeys = getFromStore(index, store);
+      const exposedSubKeys = getFromStore(store, index);
       for (const exposedSubKey of exposedSubKeys) {
         if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-          const token = findInStore(family, subKey, store);
-          getFromStore(token, store);
-          const jsonToken = getJsonToken(token, store);
+          const token = findInStore(store, family, subKey);
+          getFromStore(store, token);
+          const jsonToken = getJsonToken(store, token);
           const updateToken = getUpdateToken(token);
-          socket.emit(`init:${token.key}`, getFromStore(jsonToken, store));
+          socket.emit(`init:${token.key}`, getFromStore(store, jsonToken));
           const unsubscribe = subscribeToState(
             updateToken,
             ({ newValue }) => {
@@ -819,7 +855,7 @@ function realtimeMutableProvider({
 }) {
   return function mutableProvider(token) {
     let unsubscribeFromStateUpdates = null;
-    const jsonToken = getJsonToken(token, store);
+    const jsonToken = getJsonToken(store, token);
     const trackerToken = getUpdateToken(token);
     const fillUnsubRequest = () => {
       socket.off(`unsub:${token.key}`, fillUnsubRequest);
@@ -827,7 +863,7 @@ function realtimeMutableProvider({
       unsubscribeFromStateUpdates = null;
     };
     const fillSubRequest = () => {
-      socket.emit(`init:${token.key}`, getFromStore(jsonToken, store));
+      socket.emit(`init:${token.key}`, getFromStore(store, jsonToken));
       unsubscribeFromStateUpdates = subscribeToState(
         trackerToken,
         ({ newValue }) => {
@@ -852,7 +888,7 @@ function realtimeStateProvider({
   return function stateProvider(token) {
     let unsubscribeFromStateUpdates;
     const fillSubRequest = () => {
-      socket.emit(`serve:${token.key}`, getFromStore(token, store));
+      socket.emit(`serve:${token.key}`, getFromStore(store, token));
       unsubscribeFromStateUpdates = subscribeToState(
         token,
         ({ newValue }) => {
@@ -886,7 +922,7 @@ function realtimeStateReceiver({
 }) {
   return function stateReceiver(token) {
     const publish = (newValue) => {
-      setIntoStore(token, newValue, store);
+      setIntoStore(store, token, newValue);
     };
     const fillPubUnclaim = () => {
       socket.off(`pub:${token.key}`, publish);

package/realtime-server/src/realtime-continuity-synchronizer.ts

@@ -5,8 +5,10 @@ import {
 	findInStore,
 	getFromStore,
 	getJsonToken,
+	getUpdateToken,
 	IMPLICIT,
 	isRootStore,
+	setIntoStore,
 	subscribeToState,
 	subscribeToTransaction,
 } from "atom.io/internal"
@@ -36,7 +38,7 @@ export function realtimeContinuitySynchronizer({
 			socket.id,
 			store,
 		).userKeyOfSocket
-		const userKey = getFromStore(userKeyState, store)
+		const userKey = getFromStore(store, userKeyState)
 		if (!userKey) {
 			store.logger.error(
 				`❌`,
@@ -62,30 +64,36 @@ export function realtimeContinuitySynchronizer({
 					`seeing ${userKey} on new socket ${newSocketKey}`,
 				)
 				if (newSocketKey === null) {
-					store.logger.error(
+					store.logger.warn(
 						`❌`,
 						`continuity`,
 						continuityKey,
-						`Tried to create a synchronizer for a user (${userKey}) that is not connected to a socket.`,
+						`User (${userKey}) is not connected to a socket, waiting for them to reappear.`,
 					)
 					return
 				}
-				const newSocketState = findInStore(socketAtoms, newSocketKey, store)
-				const newSocket = getFromStore(newSocketState, store)
+				const newSocketState = findInStore(store, socketAtoms, newSocketKey)
+				const newSocket = getFromStore(store, newSocketState)
 				socket = newSocket
+				for (const unacknowledgedUpdate of userUnacknowledgedUpdates) {
+					socket?.emit(
+						`tx-new:${continuityKey}`,
+						unacknowledgedUpdate as Json.Serializable,
+					)
+				}
 			},
 			`sync-continuity:${continuityKey}:${userKey}`,
 			store,
 		)
 
 		const userUnacknowledgedQueue = findInStore(
+			store,
 			userUnacknowledgedQueues,
 			userKey,
-			store,
 		)
 		const userUnacknowledgedUpdates = getFromStore(
-			userUnacknowledgedQueue,
 			store,
+			userUnacknowledgedQueue,
 		)
 		const unsubscribeFunctions: (() => void)[] = []
 
@@ -93,7 +101,7 @@ export function realtimeContinuitySynchronizer({
 			const unsubFns: (() => void)[] = []
 			for (const perspective of continuity.perspectives) {
 				const { viewAtoms } = perspective
-				const userViewState = findInStore(viewAtoms, userKey, store)
+				const userViewState = findInStore(store, viewAtoms, userKey)
 				const unsubscribe = subscribeToState(
 					userViewState,
 					({ oldValue, newValue }) => {
@@ -107,9 +115,9 @@ export function realtimeContinuitySynchronizer({
 							.flatMap((token) => {
 								const resourceToken =
 									token.type === `mutable_atom`
-										? getJsonToken(token, store)
+										? getJsonToken(store, token)
 										: token
-								const resource = getFromStore(resourceToken, store)
+								const resource = getFromStore(store, resourceToken)
 								return [resourceToken, resource]
 							})
 						store.logger.info(
@@ -141,13 +149,14 @@ export function realtimeContinuitySynchronizer({
 			const initialPayload: Json.Serializable[] = []
 			for (const atom of continuity.globals) {
 				const resourceToken =
-					atom.type === `mutable_atom` ? getJsonToken(atom, store) : atom
-				initialPayload.push(resourceToken, getFromStore(atom, store))
+					atom.type === `mutable_atom` ? getJsonToken(store, atom) : atom
+				const resource = getFromStore(store, resourceToken)
+				initialPayload.push(resourceToken, resource)
 			}
 			for (const perspective of continuity.perspectives) {
 				const { viewAtoms, resourceAtoms } = perspective
-				const userViewState = findInStore(viewAtoms, userKey, store)
-				const userView = getFromStore(userViewState, store)
+				const userViewState = findInStore(store, viewAtoms, userKey)
+				const userView = getFromStore(store, userViewState)
 				store.logger.info(`👁`, `atom`, resourceAtoms.key, `${userKey} can see`, {
 					viewAtoms,
 					resourceAtoms,
@@ -156,9 +165,9 @@ export function realtimeContinuitySynchronizer({
 				for (const visibleToken of userView) {
 					const resourceToken =
 						visibleToken.type === `mutable_atom`
-							? getJsonToken(visibleToken, store)
+							? getJsonToken(store, visibleToken)
 							: visibleToken
-					const resource = getFromStore(resourceToken, store)
+					const resource = getFromStore(store, resourceToken)
 
 					initialPayload.push(resourceToken, resource)
 				}
@@ -176,18 +185,23 @@ export function realtimeContinuitySynchronizer({
 					(update) => {
 						try {
 							const visibleKeys = continuity.globals
-								.map((atom) => atom.key)
+								.map((atom) => {
+									if (atom.type === `atom`) {
+										return atom.key
+									}
+									return getUpdateToken(atom).key
+								})
 								.concat(
 									continuity.perspectives.flatMap((perspective) => {
 										const { viewAtoms } = perspective
 										const userPerspectiveTokenState = findInStore(
+											store,
 											viewAtoms,
 											userKey,
-											store,
 										)
 										const visibleTokens = getFromStore(
-											userPerspectiveTokenState,
 											store,
+											userPerspectiveTokenState,
 										)
 										return visibleTokens.map((token) => {
 											const key =
@@ -206,17 +220,13 @@ export function realtimeContinuitySynchronizer({
 								...update,
 								updates: redactedUpdates,
 							}
-							// setIntoStore(
-							// 	userUnacknowledgedQueue,
-							// 	(updates) => {
-							// 		if (redactedUpdate) {
-							// 			updates.push(redactedUpdate)
-							// 			updates.sort((a, b) => a.epoch - b.epoch)
-							// 		}
-							// 		return updates
-							// 	},
-							// 	store,
-							// )
+							setIntoStore(store, userUnacknowledgedQueue, (updates) => {
+								if (redactedUpdate) {
+									updates.push(redactedUpdate)
+									updates.sort((a, b) => a.epoch - b.epoch)
+								}
+								return updates
+							})
 
 							socket?.emit(
 								`tx-new:${continuityKey}`,
@@ -304,73 +314,27 @@ export function realtimeContinuitySynchronizer({
 		socket.off(`tx-run:${continuityKey}`, fillTransactionRequest)
 		socket.on(`tx-run:${continuityKey}`, fillTransactionRequest)
 
-		// let i = 0
-		// let n = 1
-		// let retryTimeout: NodeJS.Timeout | undefined
-		// const trackClientAcknowledgement = (epoch: number) => {
-		// 	store.logger.info(
-		// 		`👍`,
-		// 		`continuity`,
-		// 		continuityKey,
-		// 		`${userKey} acknowledged epoch ${epoch}`,
-		// 	)
-		// 	const isUnacknowledged = userUnacknowledgedUpdates[0]?.epoch === epoch
-		// 	if (isUnacknowledged) {
-		// 		setIntoStore(
-		// 			userUnacknowledgedQueue,
-		// 			(updates) => {
-		// 				updates.shift()
-		// 				return updates
-		// 			},
-		// 			store,
-		// 		)
-		// 	}
-		// }
-		// subscribeToState(
-		// 	userUnacknowledgedQueue,
-		// 	({ newValue }) => {
-		// 		if (newValue.length === 0) {
-		// 			clearInterval(retryTimeout)
-		// 			socket?.off(`ack:${continuityKey}`, trackClientAcknowledgement)
-		// 			retryTimeout = undefined
-		// 		}
-		// 		if (newValue.length > 0) {
-		// 			if (retryTimeout) {
-		// 				return
-		// 			}
-
-		// 			socket?.on(`ack:${continuityKey}`, trackClientAcknowledgement)
-
-		// 			retryTimeout = setInterval(() => {
-		// 				i++
-		// 				if (i === n) {
-		// 					n += i
-		// 					const toEmit = newValue[0]
-		// 					if (!toEmit) return
-		// 					store.logger.info(
-		// 						`🔄`,
-		// 						`continuity`,
-		// 						continuityKey,
-		// 						`${store.config.name} retrying ${userKey}`,
-		// 						socket?.id,
-		// 						newValue,
-		// 					)
-		// 					socket?.emit(
-		// 						`tx-new:${continuityKey}`,
-		// 						toEmit as Json.Serializable,
-		// 					)
-		// 				}
-		// 			}, 250)
-		// 		}
-		// 	},
-		// 	`sync-continuity:${continuityKey}:${userKey}`,
-		// 	store,
-		// )
+		const trackClientAcknowledgement = (epoch: number) => {
+			store.logger.info(
+				`👍`,
+				`continuity`,
+				continuityKey,
+				`${userKey} acknowledged epoch ${epoch}`,
+			)
+			const isUnacknowledged = userUnacknowledgedUpdates[0]?.epoch === epoch
+			if (isUnacknowledged) {
+				setIntoStore(store, userUnacknowledgedQueue, (updates) => {
+					updates.shift()
+					return updates
+				})
+			}
+		}
+		socket?.on(`ack:${continuityKey}`, trackClientAcknowledgement)
 
 		return () => {
 			// clearInterval(retryTimeout)
 			for (const unsubscribe of unsubscribeFunctions) unsubscribe()
-			// socket?.off(`ack:${continuityKey}`, trackClientAcknowledgement)
+			socket?.off(`ack:${continuityKey}`, trackClientAcknowledgement)
 			unsubscribeFromPerspectives()
 			socket?.off(`get:${continuityKey}`, sendInitialPayload)
 			socket?.off(`tx-run:${continuityKey}`, fillTransactionRequest)

package/realtime-server/src/realtime-family-provider.ts

@@ -34,11 +34,11 @@ export function realtimeAtomFamilyProvider({
 		}
 
 		const fillSubRequest = (subKey: K) => {
-			const exposedSubKeys = getFromStore(index, store)
+			const exposedSubKeys = getFromStore(store, index)
 			for (const exposedSubKey of exposedSubKeys) {
 				if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-					const token = findInStore(family, subKey, store)
-					socket.emit(`serve:${token.key}`, getFromStore(token, store))
+					const token = findInStore(store, family, subKey)
+					socket.emit(`serve:${token.key}`, getFromStore(store, token))
 					const unsubscribe = subscribeToState(
 						token,
 						({ newValue }) => {

package/realtime-server/src/realtime-mutable-family-provider.ts

@@ -40,14 +40,14 @@ export function realtimeMutableFamilyProvider({
 		}
 
 		const fillSubRequest = (subKey: K) => {
-			const exposedSubKeys = getFromStore(index, store)
+			const exposedSubKeys = getFromStore(store, index)
 			for (const exposedSubKey of exposedSubKeys) {
 				if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-					const token = findInStore(family, subKey, store)
-					getFromStore(token, store)
-					const jsonToken = getJsonToken(token, store)
+					const token = findInStore(store, family, subKey)
+					getFromStore(store, token)
+					const jsonToken = getJsonToken(store, token)
 					const updateToken = getUpdateToken(token)
-					socket.emit(`init:${token.key}`, getFromStore(jsonToken, store))
+					socket.emit(`init:${token.key}`, getFromStore(store, jsonToken))
 					const unsubscribe = subscribeToState(
 						updateToken,
 						({ newValue }) => {

package/realtime-server/src/realtime-mutable-provider.ts

@@ -22,7 +22,7 @@ export function realtimeMutableProvider({
 	>(token: AtomIO.MutableAtomToken<Core, SerializableCore>): () => void {
 		let unsubscribeFromStateUpdates: (() => void) | null = null
 
-		const jsonToken = getJsonToken(token, store)
+		const jsonToken = getJsonToken(store, token)
 		const trackerToken = getUpdateToken(token)
 
 		const fillUnsubRequest = () => {
@@ -32,7 +32,7 @@ export function realtimeMutableProvider({
 		}
 
 		const fillSubRequest = () => {
-			socket.emit(`init:${token.key}`, getFromStore(jsonToken, store))
+			socket.emit(`init:${token.key}`, getFromStore(store, jsonToken))
 			unsubscribeFromStateUpdates = subscribeToState(
 				trackerToken,
 				({ newValue }) => {

package/realtime-server/src/realtime-state-provider.ts

@@ -15,7 +15,7 @@ export function realtimeStateProvider({
 		let unsubscribeFromStateUpdates: (() => void) | undefined
 
 		const fillSubRequest = () => {
-			socket.emit(`serve:${token.key}`, getFromStore(token, store))
+			socket.emit(`serve:${token.key}`, getFromStore(store, token))
 
 			unsubscribeFromStateUpdates = subscribeToState(
 				token,

package/realtime-server/src/realtime-state-receiver.ts

@@ -13,7 +13,7 @@ export function realtimeStateReceiver({
 		token: WritableToken<J>,
 	): () => void {
 		const publish = (newValue: J) => {
-			setIntoStore(token, newValue, store)
+			setIntoStore(store, token, newValue)
 		}
 
 		const fillPubUnclaim = () => {

package/realtime-testing/dist/index.d.ts

@@ -9,6 +9,7 @@ type TestSetupOptions = {
     server: (tools: {
         socket: SocketIO.Socket;
         silo: AtomIO.Silo;
+        enableLogging: () => void;
     }) => void;
 };
 type TestSetupOptions__SingleClient = TestSetupOptions & {
@@ -26,6 +27,7 @@ type RealtimeTestTools = {
 type RealtimeTestClient = RealtimeTestTools & {
     renderResult: RenderResult;
     prettyPrint: () => void;
+    enableLogging: () => void;
     socket: Socket;
 };
 type RealtimeTestClientBuilder = {