npm - tempest.games - Versions diffs - 0.3.9 → 0.3.11 - Mend

tempest.games 0.3.9 → 0.3.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/CHANGELOG.md +14 -0
package/app/assets/{index-CuDmqoP5.js → index-suqgKgd6.js} +220 -220
package/app/index.html +1 -1
package/bin/backend.bun.js +37 -5
package/bin/backend.worker.bug-rangers.bun.js +201 -41
package/bin/frontend.bun.js +32 -5
package/bin/setup-db.bun.js +2 -2
package/package.json +4 -4

package/app/index.html CHANGED Viewed

@@ -10,7 +10,7 @@
     />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <title>TEMPEST</title>
-    <script type="module" crossorigin src="/assets/index-CuDmqoP5.js"></script>
+    <script type="module" crossorigin src="/assets/index-suqgKgd6.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-oxk15HrU.css">
   </head>
   <body>

package/bin/backend.bun.js CHANGED Viewed

@@ -4146,7 +4146,7 @@ function realtimeMutableFamilyProvider({
         } else {
           exposedSubKeys = staticIndex;
         }
-        const shouldExpose = isAvailable(exposedSubKeys, subKey);
+        const shouldExpose = exposedSubKeys && isAvailable(exposedSubKeys, subKey);
         if (shouldExpose) {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is approved for a subscription to`, subKey, `in family "${family.key}"`);
           exposeFamilyMembers(subKey);
@@ -4159,6 +4159,8 @@ function realtimeMutableFamilyProvider({
       if (dynamicIndex) {
         coreSubscriptions.add(subscribeToState(store, dynamicIndex, `expose-family:${family.key}:${socket.id}`, ({ newValue: newExposedSubKeys }) => {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `has the following keys available for family "${family.key}"`, newExposedSubKeys);
+          if (newExposedSubKeys === null)
+            return;
           for (const subKey of newExposedSubKeys) {
             if (familyMemberSubscriptionsWanted.has(stringifyJson(subKey))) {
               store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is retroactively approved for a subscription to`, subKey, `in family "${family.key}"`);
@@ -4550,7 +4552,7 @@ function realtimeAtomFamilyProvider({
         } else {
           exposedSubKeys = staticIndex;
         }
-        const shouldExpose = isAvailable2(exposedSubKeys, subKey);
+        const shouldExpose = exposedSubKeys && isAvailable2(exposedSubKeys, subKey);
         if (shouldExpose) {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is approved for a subscription to`, subKey, `in family "${family.key}"`);
           exposeFamilyMembers(subKey);
@@ -4563,6 +4565,8 @@ function realtimeAtomFamilyProvider({
       if (dynamicIndex) {
         coreSubscriptions.add(subscribeToState(store, dynamicIndex, `expose-family:${family.key}:${socket.id}`, ({ newValue: newExposedSubKeys }) => {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `has the following keys available for family "${family.key}"`, newExposedSubKeys);
+          if (newExposedSubKeys === null)
+            return;
           for (const subKey of newExposedSubKeys) {
             if (familyMemberSubscriptionsWanted.has(stringifyJson(subKey))) {
               store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is retroactively approved for a subscription to`, subKey, `in family "${family.key}"`);
@@ -4662,7 +4666,7 @@ var storageSync = (storage, { stringify, parse }, key) => ({ setSelf, onSet }) =
 var init_web = () => {};
 // ../../packages/atom.io/dist/realtime-client/index.js
-var mySocketKeyAtom, myUserKeyAtom, myRoomKeySelector, optimisticUpdateQueueAtom, confirmedUpdateQueueAtom;
+var mySocketKeyAtom, myUserKeyAtom, myRoomKeySelector, usersHereSelector, roomOwnerSelector, optimisticUpdateQueueAtom, confirmedUpdateQueueAtom;
 var init_realtime_client = __esm(() => {
   init_main();
   init_main();
@@ -4696,6 +4700,29 @@ var init_realtime_client = __esm(() => {
       return null;
     }
   });
+  usersHereSelector = selector({
+    key: `usersHere`,
+    get: ({ get, find }) => {
+      const myRoomKey = get(myRoomKeySelector);
+      if (!myRoomKey)
+        return null;
+      const [usersInRoomsAtoms] = getInternalRelations(usersInRooms, `split`);
+      return get(find(usersInRoomsAtoms, myRoomKey));
+    }
+  });
+  roomOwnerSelector = selector({
+    key: `roomOwner`,
+    get: ({ get }) => {
+      const myRoomKey = get(myRoomKeySelector);
+      if (!myRoomKey)
+        return null;
+      const [, ownerOfRoomsAtoms] = getInternalRelations(ownersOfRooms, `split`);
+      const owner = get(ownerOfRoomsAtoms, myRoomKey);
+      for (const userKey of owner)
+        return userKey;
+      return null;
+    }
+  });
   optimisticUpdateQueueAtom = atom({
     key: `optimisticUpdateQueue`,
     default: () => []
@@ -21990,7 +22017,7 @@ var require_dist2 = __commonJS((exports, module) => {
   module.exports.Socket = socket_1.Socket;
 });
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/standard.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/standard.js
 function ensureSynchronous(value, message) {
   if (value instanceof Promise)
     throw new Error(message);
@@ -22017,7 +22044,7 @@ function parseWithDictionary(dictionary, value) {
 }
 var init_standard = () => {};
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/index.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/index.js
 function createEnv(opts) {
   const runtimeEnv = opts.runtimeEnvStrict ?? opts.runtimeEnv ?? process.env;
   if (opts.emptyStringAsUndefined ?? false) {
@@ -88200,6 +88227,10 @@ var cpuCountAtom = atom2({
     }
   ]
 });
+var isAdminAtom = atom2({
+  key: `isAdmin`,
+  default: false
+});
 // src/library/username-state.ts
 init_drizzle_orm();
@@ -88284,6 +88315,7 @@ var serveSocket = (config3) => {
   const provideFamily = realtimeAtomFamilyProvider(config3);
   const mutualsSelector = findState(mutualUsersSelector2, consumer);
   const unsubFunctions = [
+    provideState(isAdminAtom, findState(roomAdminsSelectors, consumer)),
     provideState(cpuCountAtom),
     provideFamily(usernameAtoms, mutualsSelector),
     provideRooms({

package/bin/backend.worker.bug-rangers.bun.js CHANGED Viewed

@@ -12823,7 +12823,7 @@ function realtimeMutableFamilyProvider({
         } else {
           exposedSubKeys = staticIndex;
         }
-        const shouldExpose = isAvailable(exposedSubKeys, subKey);
+        const shouldExpose = exposedSubKeys && isAvailable(exposedSubKeys, subKey);
         if (shouldExpose) {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is approved for a subscription to`, subKey, `in family "${family.key}"`);
           exposeFamilyMembers(subKey);
@@ -12836,6 +12836,8 @@ function realtimeMutableFamilyProvider({
       if (dynamicIndex) {
         coreSubscriptions.add(subscribeToState(store, dynamicIndex, `expose-family:${family.key}:${socket.id}`, ({ newValue: newExposedSubKeys }) => {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `has the following keys available for family "${family.key}"`, newExposedSubKeys);
+          if (newExposedSubKeys === null)
+            return;
           for (const subKey of newExposedSubKeys) {
             if (familyMemberSubscriptionsWanted.has(stringifyJson(subKey))) {
               store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is retroactively approved for a subscription to`, subKey, `in family "${family.key}"`);
@@ -13227,7 +13229,7 @@ function realtimeAtomFamilyProvider({
         } else {
           exposedSubKeys = staticIndex;
         }
-        const shouldExpose = isAvailable2(exposedSubKeys, subKey);
+        const shouldExpose = exposedSubKeys && isAvailable2(exposedSubKeys, subKey);
         if (shouldExpose) {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is approved for a subscription to`, subKey, `in family "${family.key}"`);
           exposeFamilyMembers(subKey);
@@ -13240,6 +13242,8 @@ function realtimeAtomFamilyProvider({
       if (dynamicIndex) {
         coreSubscriptions.add(subscribeToState(store, dynamicIndex, `expose-family:${family.key}:${socket.id}`, ({ newValue: newExposedSubKeys }) => {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `has the following keys available for family "${family.key}"`, newExposedSubKeys);
+          if (newExposedSubKeys === null)
+            return;
           for (const subKey of newExposedSubKeys) {
             if (familyMemberSubscriptionsWanted.has(stringifyJson(subKey))) {
               store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is retroactively approved for a subscription to`, subKey, `in family "${family.key}"`);
@@ -13318,7 +13322,7 @@ var init_realtime_state_provider = __esm(() => {
 var init_realtime_state_receiver = () => {};
 // ../../packages/atom.io/dist/realtime-client/index.js
-var mySocketKeyAtom2, myUserKeyAtom2, myRoomKeySelector2, optimisticUpdateQueueAtom, confirmedUpdateQueueAtom;
+var mySocketKeyAtom2, myUserKeyAtom2, myRoomKeySelector2, usersHereSelector2, roomOwnerSelector2, optimisticUpdateQueueAtom, confirmedUpdateQueueAtom;
 var init_realtime_client = __esm(() => {
   init_main();
   init_main();
@@ -13352,6 +13356,29 @@ var init_realtime_client = __esm(() => {
       return null;
     }
   });
+  usersHereSelector2 = selector({
+    key: `usersHere`,
+    get: ({ get, find }) => {
+      const myRoomKey = get(myRoomKeySelector2);
+      if (!myRoomKey)
+        return null;
+      const [usersInRoomsAtoms] = getInternalRelations(usersInRooms2, `split`);
+      return get(find(usersInRoomsAtoms, myRoomKey));
+    }
+  });
+  roomOwnerSelector2 = selector({
+    key: `roomOwner`,
+    get: ({ get }) => {
+      const myRoomKey = get(myRoomKeySelector2);
+      if (!myRoomKey)
+        return null;
+      const [, ownerOfRoomsAtoms] = getInternalRelations(ownersOfRooms2, `split`);
+      const owner = get(ownerOfRoomsAtoms, myRoomKey);
+      for (const userKey of owner)
+        return userKey;
+      return null;
+    }
+  });
   optimisticUpdateQueueAtom = atom({
     key: `optimisticUpdateQueue`,
     default: () => []
@@ -15176,7 +15203,7 @@ var require_src2 = __commonJS((exports, module2) => {
   }
 });
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/standard.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/standard.js
 function ensureSynchronous(value3, message) {
   if (value3 instanceof Promise)
     throw new Error(message);
@@ -15203,7 +15230,7 @@ function parseWithDictionary(dictionary, value3) {
 }
 var init_standard = () => {};
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/index.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/index.js
 function createEnv(opts) {
   const runtimeEnv = opts.runtimeEnvStrict ?? opts.runtimeEnv ?? process.env;
   if (opts.emptyStringAsUndefined ?? false) {
@@ -15337,13 +15364,6 @@ function atomFamily2(options) {
   return createRegularAtomFamily(IMPLICIT.STORE, options);
 }
-// ../../packages/atom.io/src/main/find-state.ts
-init_internal();
-function findState(token, key) {
-  const state = findInStore(IMPLICIT.STORE, token, key);
-  return state;
-}
 // ../../packages/atom.io/src/main/get-state.ts
 init_internal();
 function getState2(...params) {
@@ -15352,9 +15372,6 @@ function getState2(...params) {
 // ../../packages/atom.io/src/main/join.ts
 init_internal();
-function findRelations(token, key) {
-  return findRelationsInStore(IMPLICIT.STORE, token, key);
-}
 function getInternalRelations2(token, split) {
   return getInternalRelationsFromStore(IMPLICIT.STORE, token, split);
 }
@@ -15600,6 +15617,34 @@ var myRoomKeySelector = selector({
     return null;
   }
 });
+var usersHereSelector = selector({
+  key: `usersHere`,
+  get: ({ get, find }) => {
+    const myRoomKey = get(myRoomKeySelector);
+    if (!myRoomKey)
+      return null;
+    const [usersInRoomsAtoms] = getInternalRelations(usersInRooms2, `split`);
+    const users = get(find(usersInRoomsAtoms, myRoomKey));
+    return users;
+  }
+});
+var roomOwnerSelector = selector({
+  key: `roomOwner`,
+  get: ({ get }) => {
+    const myRoomKey = get(myRoomKeySelector);
+    if (!myRoomKey)
+      return null;
+    const [, ownerOfRoomsAtoms] = getInternalRelations(ownersOfRooms2, `split`);
+    const owner = get(ownerOfRoomsAtoms, myRoomKey);
+    for (const userKey of owner)
+      return userKey;
+    return null;
+  }
+});
+// ../../packages/atom.io/src/realtime-client/pull-atom.ts
+init_internal();
+init_realtime();
 // ../../packages/atom.io/src/realtime-client/create-subscriber.ts
 init_internal();
@@ -15644,6 +15689,59 @@ function createSubscriber(socket, key, open) {
   };
 }
+// ../../packages/atom.io/src/realtime-client/pull-atom.ts
+function pullAtom(store, socket, token) {
+  return createSubscriber(socket, token.key, (key) => {
+    const stopWatching = employSocket2(socket, `serve:${key}`, (data) => {
+      setIntoStore(store, token, data);
+    });
+    socket.emit(`sub:${token.key}`);
+    return () => {
+      socket.emit(`unsub:${key}`);
+      stopWatching();
+    };
+  });
+}
+// ../../packages/atom.io/src/realtime-client/pull-atom-family-member.ts
+init_internal();
+init_realtime();
+function pullAtomFamilyMember(store, socket, family, key) {
+  const token = findInStore(store, family, key);
+  return createSubscriber(socket, token.key, () => {
+    const stopWatching = employSocket2(socket, `serve:${token.key}`, (data) => {
+      setIntoStore(store, token, data);
+    });
+    socket.emit(`sub:${family.key}`, key);
+    return () => {
+      socket.emit(`unsub:${token.key}`);
+      stopWatching();
+    };
+  });
+}
+// ../../packages/atom.io/src/realtime-client/pull-mutable-atom.ts
+init_internal();
+init_realtime();
+function pullMutableAtom(store, socket, token) {
+  const jsonToken = getJsonToken(store, token);
+  const updateToken = getUpdateToken(token);
+  return createSubscriber(socket, token.key, () => {
+    const stopWatchingForInit = employSocket2(socket, `init:${token.key}`, (data) => {
+      setIntoStore(store, jsonToken, data);
+    });
+    const stopWatchingForUpdate = employSocket2(socket, `next:${token.key}`, (data) => {
+      setIntoStore(store, updateToken, data);
+    });
+    socket.emit(`sub:${token.key}`);
+    return () => {
+      socket.emit(`unsub:${token.key}`);
+      stopWatchingForInit();
+      stopWatchingForUpdate();
+    };
+  });
+}
 // ../../packages/atom.io/src/realtime-client/pull-mutable-atom-family-member.ts
 init_internal();
 init_realtime();
@@ -15667,6 +15765,69 @@ function pullMutableAtomFamilyMember(store, socket, family, key) {
   });
 }
+// ../../packages/atom.io/src/realtime-client/pull-selector-roots.ts
+init_internal();
+init_json();
+function pullSelectorRoots(store, socket, selectorToken) {
+  const atomSubscriptions = new Map;
+  const start = () => {
+    const atomKeys = store.selectorAtoms.getRelatedKeys(selectorToken.key);
+    if (atomKeys) {
+      for (const [atomKey, unsub] of atomSubscriptions) {
+        if (!atomKeys.has(atomKey)) {
+          unsub();
+          atomSubscriptions.delete(atomKey);
+        }
+      }
+      for (const atomKey of atomKeys) {
+        if (atomSubscriptions.has(atomKey)) {
+          continue;
+        }
+        const atom3 = store.atoms.get(atomKey);
+        switch (atom3.type) {
+          case `atom`: {
+            if (atom3.family) {
+              const { subKey: serializedSubKey } = atom3.family;
+              const subKey = parseJson2(serializedSubKey);
+              const family = getFamilyOfToken(store, atom3);
+              atomSubscriptions.set(atomKey, pullAtomFamilyMember(store, socket, family, subKey));
+            } else {
+              atomSubscriptions.set(atomKey, pullAtom(store, socket, atom3));
+            }
+            break;
+          }
+          case `mutable_atom`: {
+            if (atom3.family) {
+              const { subKey: serializedSubKey } = atom3.family;
+              const subKey = parseJson2(serializedSubKey);
+              const family = getFamilyOfToken(store, atom3);
+              atomSubscriptions.set(atomKey, pullMutableAtomFamilyMember(store, socket, family, subKey));
+            } else {
+              atomSubscriptions.set(atomKey, pullMutableAtom(store, socket, atom3));
+            }
+            break;
+          }
+        }
+      }
+    }
+  };
+  const unsubFromSelector = subscribeToState(store, selectorToken, `pull-watches-dependencies`, () => {
+    start();
+  });
+  start();
+  return () => {
+    for (const [, unsub] of atomSubscriptions)
+      unsub();
+    atomSubscriptions.clear();
+    unsubFromSelector();
+  };
+}
+// ../../packages/atom.io/src/realtime-client/pull-selector.ts
+function pullSelector(store, socket, token) {
+  return pullSelectorRoots(store, socket, token);
+}
 // src/backend.worker.bug-rangers.bun.ts
 init_realtime_server();
@@ -28937,8 +29098,10 @@ var setupGroupsSelector = selector2({
     if (!roomKey) {
       return { notReady, readyDoesNotWantFirst, readyWantsFirst };
     }
-    const [usersInRoomsAtoms] = getInternalRelations2(usersInRooms, `split`);
-    const usersHere = get(usersInRoomsAtoms, roomKey);
+    const usersHere = get(usersHereSelector);
+    if (usersHere === null) {
+      return { notReady, readyDoesNotWantFirst, readyWantsFirst };
+    }
     for (const userKey of usersHere) {
       const playerReadyStatus = get(playerReadyStatusAtoms, userKey);
       if (turnOrder.includes(userKey))
@@ -29064,12 +29227,19 @@ function pureShuffle(array) {
 }
 // src/backend.worker.bug-rangers.bun.ts
-var parent = process.parentSocket ??= new ParentSocket(process);
+var parent = process.PS ??= new ParentSocket(process);
 Object.assign(console, parent.logger, { log: parent.logger.info });
 parent.on(`timeToStop`, function gracefulExit() {
   parent.logger.info(`\uD83D\uDEEC game worker exiting`);
   process.exit(0);
 });
+(function globalSetup() {
+  if (process.globalSetupDone)
+    return;
+  process.globalSetupDone = true;
+  pullSelector(IMPLICIT.STORE, parentSocket, usersHereSelector);
+  pullSelector(IMPLICIT.STORE, parentSocket, roomOwnerSelector);
+})();
 IMPLICIT.STORE.loggers[0] = new AtomIOLogger2(`info`, (...params) => {
   if (![`\u2B55`, `\uD83D\uDD34`, `\uD83D\uDFE2`, `\uD83D\uDEAB`, `\u274C`, `\uD83D\uDC40`, `\uD83D\uDE48`].includes(params[0])) {
     return false;
@@ -29105,42 +29275,30 @@ var bugRangersGuard = {
   turnRestart: type([]),
   turnEnd: type([])
 };
-var ROOM_KEY = process.env[`REALTIME_ROOM_KEY`];
-var usersInRoomsAtoms = getInternalRelations2(usersInRooms);
-var ownersOfRoomsAtoms = getInternalRelations2(ownersOfRooms);
-(function globalSetup() {
-  if (process.globalSetupDone)
-    return;
-  process.globalSetupDone = true;
-  pullMutableAtomFamilyMember(IMPLICIT.STORE, parentSocket, usersInRoomsAtoms, ROOM_KEY);
-  pullMutableAtomFamilyMember(IMPLICIT.STORE, parentSocket, ownersOfRoomsAtoms, ROOM_KEY);
-})();
 parent.receiveRelay((socket, userKey) => {
   const config3 = { socket, consumer: userKey };
   const exposeState = realtimeStateProvider(config3);
   const exposeMutable = realtimeMutableProvider(config3);
   const exposeFamily = realtimeAtomFamilyProvider(config3);
   const gameSocket = guardSocket(socket, bugRangersGuard, parent.logger.error);
-  const usersHereAtom = findState(usersInRoomsAtoms, ROOM_KEY);
   const coreStack = [];
-  coreStack.push(exposeState(turnNumberAtom), exposeState(gameStateAtom), exposeState(turnInProgressAtom), exposeMutable(playerTurnOrderAtom), exposeMutable(gameTilesAtom), exposeFamily(playerReadyStatusAtoms, usersHereAtom), exposeFamily(playerColorAtoms, usersHereAtom), exposeFamily(playerRemainingCubesAtoms, usersHereAtom), exposeFamily(playerRemainingTilesAtoms, usersHereAtom), exposeFamily(tileOwnerAtoms, gameTilesAtom), exposeFamily(tileCubeCountAtoms, gameTilesAtom), exposeFamily(gameTilesStackHeightAtoms, gameTilesAtom), employSocket(gameSocket, `wantFirst`, () => {
+  coreStack.push(exposeState(turnNumberAtom), exposeState(gameStateAtom), exposeState(turnInProgressAtom), exposeMutable(playerTurnOrderAtom), exposeMutable(gameTilesAtom), exposeFamily(playerReadyStatusAtoms, usersHereSelector), exposeFamily(playerColorAtoms, usersHereSelector), exposeFamily(playerRemainingCubesAtoms, usersHereSelector), exposeFamily(playerRemainingTilesAtoms, usersHereSelector), exposeFamily(tileOwnerAtoms, gameTilesAtom), exposeFamily(tileCubeCountAtoms, gameTilesAtom), exposeFamily(gameTilesStackHeightAtoms, gameTilesAtom), employSocket(gameSocket, `wantFirst`, () => {
     const gameState = getState2(gameStateAtom);
-    if (gameState === `setup`) {
-      setState(playerReadyStatusAtoms, userKey, `readyWantsFirst`);
-    }
+    if (gameState !== `setup`)
+      return;
+    setState(playerReadyStatusAtoms, userKey, `readyWantsFirst`);
   }), employSocket(gameSocket, `wantNotFirst`, () => {
     const gameState = getState2(gameStateAtom);
-    if (gameState === `setup`) {
-      setState(playerReadyStatusAtoms, userKey, `readyDoesNotWantFirst`);
-    }
+    if (gameState !== `setup`)
+      return;
+    setState(playerReadyStatusAtoms, userKey, `readyDoesNotWantFirst`);
   }), employSocket(gameSocket, `startGame`, async () => {
-    const ownerOfRoomSelector = findRelations(ownersOfRooms, ROOM_KEY).userKeyOfRoom;
-    const ownerOfRoom = getState2(ownerOfRoomSelector);
     const gameState = getState2(gameStateAtom);
-    if (ownerOfRoom !== userKey)
-      return;
     if (gameState !== `setup`)
       return;
+    const ownerOfRoom = getState2(roomOwnerSelector);
+    if (ownerOfRoom !== userKey)
+      return;
     const setupGroups = getState2(setupGroupsSelector);
     setState(gameStateAtom, `playing`);
     const firstPlayersShuffled = pureShuffle(setupGroups.readyWantsFirst);
@@ -29423,7 +29581,9 @@ parent.receiveRelay((socket, userKey) => {
     coreStack.push(employSocket(socket, `RESET_GAME`, () => {
       setState(gameStateAtom, `setup`);
       setState(playerTurnOrderAtom, (permanent) => (permanent.length = 0, permanent));
-      const usersHere = getState2(findRelations(usersInRooms, ROOM_KEY).userKeysOfRoom);
+      const usersHere = getState2(usersHereSelector);
+      if (usersHere === null)
+        return;
       for (const u of usersHere) {
         setState(playerReadyStatusAtoms, u, `notReady`);
         setState(playerColorAtoms, u, null);

package/bin/frontend.bun.js CHANGED Viewed

@@ -12802,7 +12802,7 @@ function realtimeMutableFamilyProvider({
         } else {
           exposedSubKeys = staticIndex;
         }
-        const shouldExpose = isAvailable(exposedSubKeys, subKey);
+        const shouldExpose = exposedSubKeys && isAvailable(exposedSubKeys, subKey);
         if (shouldExpose) {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is approved for a subscription to`, subKey, `in family "${family.key}"`);
           exposeFamilyMembers(subKey);
@@ -12815,6 +12815,8 @@ function realtimeMutableFamilyProvider({
       if (dynamicIndex) {
         coreSubscriptions.add(subscribeToState(store, dynamicIndex, `expose-family:${family.key}:${socket.id}`, ({ newValue: newExposedSubKeys }) => {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `has the following keys available for family "${family.key}"`, newExposedSubKeys);
+          if (newExposedSubKeys === null)
+            return;
           for (const subKey of newExposedSubKeys) {
             if (familyMemberSubscriptionsWanted.has(stringifyJson(subKey))) {
               store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is retroactively approved for a subscription to`, subKey, `in family "${family.key}"`);
@@ -13206,7 +13208,7 @@ function realtimeAtomFamilyProvider({
         } else {
           exposedSubKeys = staticIndex;
         }
-        const shouldExpose = isAvailable2(exposedSubKeys, subKey);
+        const shouldExpose = exposedSubKeys && isAvailable2(exposedSubKeys, subKey);
         if (shouldExpose) {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is approved for a subscription to`, subKey, `in family "${family.key}"`);
           exposeFamilyMembers(subKey);
@@ -13219,6 +13221,8 @@ function realtimeAtomFamilyProvider({
       if (dynamicIndex) {
         coreSubscriptions.add(subscribeToState(store, dynamicIndex, `expose-family:${family.key}:${socket.id}`, ({ newValue: newExposedSubKeys }) => {
           store.logger.info(`\uD83D\uDC40`, `user`, consumer, `has the following keys available for family "${family.key}"`, newExposedSubKeys);
+          if (newExposedSubKeys === null)
+            return;
           for (const subKey of newExposedSubKeys) {
             if (familyMemberSubscriptionsWanted.has(stringifyJson(subKey))) {
               store.logger.info(`\uD83D\uDC40`, `user`, consumer, `is retroactively approved for a subscription to`, subKey, `in family "${family.key}"`);
@@ -13318,7 +13322,7 @@ var storageSync = (storage, { stringify, parse: parse2 }, key) => ({ setSelf, on
 var init_web = () => {};
 // ../../packages/atom.io/dist/realtime-client/index.js
-var mySocketKeyAtom, myUserKeyAtom, myRoomKeySelector, optimisticUpdateQueueAtom, confirmedUpdateQueueAtom;
+var mySocketKeyAtom, myUserKeyAtom, myRoomKeySelector, usersHereSelector, roomOwnerSelector, optimisticUpdateQueueAtom, confirmedUpdateQueueAtom;
 var init_realtime_client = __esm(() => {
   init_main();
   init_main();
@@ -13352,6 +13356,29 @@ var init_realtime_client = __esm(() => {
       return null;
     }
   });
+  usersHereSelector = selector({
+    key: `usersHere`,
+    get: ({ get, find }) => {
+      const myRoomKey = get(myRoomKeySelector);
+      if (!myRoomKey)
+        return null;
+      const [usersInRoomsAtoms] = getInternalRelations(usersInRooms, `split`);
+      return get(find(usersInRoomsAtoms, myRoomKey));
+    }
+  });
+  roomOwnerSelector = selector({
+    key: `roomOwner`,
+    get: ({ get }) => {
+      const myRoomKey = get(myRoomKeySelector);
+      if (!myRoomKey)
+        return null;
+      const [, ownerOfRoomsAtoms] = getInternalRelations(ownersOfRooms, `split`);
+      const owner = get(ownerOfRoomsAtoms, myRoomKey);
+      for (const userKey of owner)
+        return userKey;
+      return null;
+    }
+  });
   optimisticUpdateQueueAtom = atom({
     key: `optimisticUpdateQueue`,
     default: () => []
@@ -13453,7 +13480,7 @@ var init_realtime_server = __esm(() => {
   init_server_socket_state();
 });
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/standard.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/standard.js
 function ensureSynchronous(value2, message) {
   if (value2 instanceof Promise)
     throw new Error(message);
@@ -13480,7 +13507,7 @@ function parseWithDictionary(dictionary, value2) {
 }
 var init_standard = () => {};
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/index.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/index.js
 function createEnv(opts) {
   const runtimeEnv = opts.runtimeEnvStrict ?? opts.runtimeEnv ?? process.env;
   if (opts.emptyStringAsUndefined ?? false) {

package/bin/setup-db.bun.js CHANGED Viewed

@@ -5598,7 +5598,7 @@ async function migrate(db, config) {
   await db.dialect.migrate(migrations, db.session, config);
 }
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/standard.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/standard.js
 function ensureSynchronous(value, message) {
   if (value instanceof Promise)
     throw new Error(message);
@@ -5624,7 +5624,7 @@ function parseWithDictionary(dictionary, value) {
   return { value: result };
 }
-// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.4/node_modules/@t3-oss/env-core/dist/index.js
+// ../../node_modules/.pnpm/@t3-oss+env-core@0.13.10_arktype@2.1.29_typescript@5.9.3_zod@4.3.5/node_modules/@t3-oss/env-core/dist/index.js
 function createEnv(opts) {
   const runtimeEnv = opts.runtimeEnvStrict ?? opts.runtimeEnv ?? process.env;
   if (opts.emptyStringAsUndefined ?? false) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "tempest.games",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "publishConfig": {
     "access": "public"
   },
@@ -37,7 +37,7 @@
     "arktype": "2.1.29",
     "cron": "4.4.0",
     "drizzle-orm": "0.45.1",
-    "motion": "12.23.26",
+    "motion": "12.24.0",
     "nanoid": "5.1.6",
     "openai": "6.15.0",
     "postgres": "3.4.7",
@@ -50,7 +50,7 @@
     "socket.io-client": "4.8.3",
     "three": "0.182.0",
     "three-stdlib": "2.36.1",
-    "atom.io": "0.46.16",
+    "atom.io": "0.46.17",
     "safedeposit": "0.1.2",
     "treetrunks": "0.1.5"
   },
@@ -76,7 +76,7 @@
     "vite": "7.3.0",
     "vite-tsconfig-paths": "6.0.3",
     "vitest": "4.0.16",
-    "flightdeck": "0.3.36",
+    "flightdeck": "0.3.37",
     "varmint": "0.5.11"
   },
   "scripts": {