test: seed the stateful activity mock instead of scripting handlers

libs/game/idle-client/src/mocks/node.ts

@@ -1,3 +1,10 @@
+import { resolveServiceURL } from '@vers/mock-services';
+import { buildActivityMockHandlers } from '@vers/mock-services/activity';
 import { setupServer } from 'msw/node';
 
-export const server = setupServer();
+/**
+ * The shared MSW server backing this package's tests. The stateful activity backend is baked in,
+ * so happy-path responses come from seeded mock-db rows; per-test handlers layer deviations on
+ * top. Lifecycle is registered once from the bunfig preload.
+ */
+export const server = setupServer(...buildActivityMockHandlers(resolveServiceURL('activity')));

libs/game/idle-client/src/resync/run-resync.test.ts

@@ -8,7 +8,7 @@ import {
   createMockEnemyData,
 } from '@vers/idle-core/test-utils';
 import { createTestAccessToken, resolveServiceURL } from '@vers/mock-services';
-import { buildActivityMockHandlers, mockActivityService } from '@vers/mock-services/activity';
+import { mockActivityService } from '@vers/mock-services/activity';
 import * as db from '@vers/mock-services/db';
 import { server } from '../mocks/node';
 import { createCheckpointSubmitter } from '../submission/create-checkpoint-submitter';
@@ -25,13 +25,11 @@ interface SetupTestConfig {
 }
 
 /**
- * Wires the stateful activity mock backend and an authed client acting as the given user, so the
+ * Builds an authed client acting as the given user, so the
  * resync's fetch, drain, and append calls hit the same state transitions the real service applies
  * to the rows the test seeds in the mock db.
  */
 async function setupTest(config: Readonly<SetupTestConfig>) {
-  server.use(...buildActivityMockHandlers(resolveServiceURL('activity')));
-
   const token = await createTestAccessToken(config.userID);
 
   const client: ActivityServiceClient = createORPCClient(

libs/game/idle-client/src/worker/handle-client-message.test.ts

@@ -1,8 +1,11 @@
 import { expect, test } from 'bun:test';
+import { createORPCClient } from '@orpc/client';
+import { RPCLink } from '@orpc/client/fetch';
 import { createMockActivityData } from '@vers/contract-activity/test-utils';
 import { ActivityFailureAction, createSimulation } from '@vers/idle-core';
-import { mockActivityService } from '@vers/mock-services/activity';
-import { server } from '../mocks/node';
+import { createTestAccessToken, resolveServiceURL } from '@vers/mock-services';
+import * as db from '@vers/mock-services/db';
+import type { ActivityServiceClient } from '../submission/types';
 import { createStubWorkerContext } from '../test-utils/create-stub-worker-context';
 import type {
   DisconnectMessage,
@@ -76,26 +79,30 @@ test('it applies the sent failure action to the live simulation', async () => {
 });
 
 test('it records the resync request for the requested avatar', async () => {
-  server.use(
-    mockActivityService.getLatestActivityProgress.handler((opts) => {
-      throw opts.errors.NOT_FOUND({ data: {} });
+  const user = await db.userCollection.create({});
+  const avatar = await db.avatarCollection.create({ userID: user.id });
+
+  const client: ActivityServiceClient = createORPCClient(
+    new RPCLink({
+      headers: { authorization: `Bearer ${await createTestAccessToken(user.id)}` },
+      url: `${resolveServiceURL('activity')}/rpc`,
     }),
   );
 
-  const context = createStubWorkerContext();
+  const context = createStubWorkerContext({ client });
 
   const channel = new MessageChannel();
 
   const message: RequestResyncMessage = {
-    avatarID: 'avatar_1',
+    avatarID: avatar.id,
     type: ClientMessageType.RequestResync,
   };
 
   const event = new MessageEvent('message', { data: message });
 
   await handleClientMessage(context, channel.port2, event);
 
-  expect(context.getResyncAvatarID()).toBe('avatar_1');
+  expect(context.getResyncAvatarID()).toBe(avatar.id);
 });
 
 test('it drops the connection on a disconnect message', async () => {